@@ -51,10 +51,9 @@ int av_match_ext(const char *filename, const char *extensions)
AVOutputFormat *av_guess_format(const char *short_name, const char *filename,
const char *mime_type)
{
- AVOutputFormat *fmt = NULL, *fmt_found;
-#if !FF_API_NEXT
+ const AVOutputFormat *fmt = NULL;
+ AVOutputFormat *fmt_found = NULL;
void *i = 0;
-#endif
int score_max, score;
/* specific test for image sequences */
@@ -66,15 +65,8 @@ AVOutputFormat *av_guess_format(const char *short_name, const char *filename,
}
#endif
/* Find the proper file type. */
- fmt_found = NULL;
score_max = 0;
-#if FF_API_NEXT
-FF_DISABLE_DEPRECATION_WARNINGS
- while ((fmt = av_oformat_next(fmt)))
-#else
- while ((fmt = av_muxer_iterate(&i)))
-#endif
- {
+ while ((fmt = av_muxer_iterate(&i))) {
score = 0;
if (fmt->name && short_name && av_match_name(short_name, fmt->name))
score += 100;
@@ -86,12 +78,9 @@ FF_DISABLE_DEPRECATION_WARNINGS
}
if (score > score_max) {
score_max = score;
- fmt_found = fmt;
+ fmt_found = (AVOutputFormat*)fmt;
}
}
-#if FF_API_NEXT
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
return fmt_found;
}
This reverts commit 909e00ae816df9b6a05b1c4d0cafb794d4d0ca28. There is no need to use the old API anymore as the new API now behaves in the same way (treating devices as formats when loaded). Signed-off-by: Josh de Kock <josh@itanimul.li> --- libavformat/format.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-)