RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/format: temporarily use old next api 

Should fix https://ffmpeg.org/pipermail/ffmpeg-devel/2018-February/225066.html

Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
This commit is contained in:
Muhammad Faiz 2018-02-09 17:03:42 +07:00
parent 10bcc41bb4
commit 909e00ae81
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/format.c
View File

@ -52,7 +52,9 @@ AVOutputFormat *av_guess_format(const char *short_name, const char *filename,
const char *mime_type) const char *mime_type)
{ {
AVOutputFormat *fmt = NULL, *fmt_found; AVOutputFormat *fmt = NULL, *fmt_found;
#if !FF_API_NEXT
void *i = 0; void *i = 0;
#endif
int score_max, score; int score_max, score;
/* specific test for image sequences */ /* specific test for image sequences */
@ -66,7 +68,13 @@ AVOutputFormat *av_guess_format(const char *short_name, const char *filename,
/* Find the proper file type. */ /* Find the proper file type. */
fmt_found = NULL; fmt_found = NULL;
score_max = 0; score_max = 0;
while ((fmt = av_muxer_iterate(&i))) { #if FF_API_NEXT
FF_DISABLE_DEPRECATION_WARNINGS
while ((fmt = av_oformat_next(fmt)))
#else
while ((fmt = av_muxer_iterate(&i)))
#endif
{
score = 0; score = 0;
if (fmt->name && short_name && av_match_name(short_name, fmt->name)) if (fmt->name && short_name && av_match_name(short_name, fmt->name))
score += 100; score += 100;
@ -81,6 +89,9 @@ AVOutputFormat *av_guess_format(const char *short_name, const char *filename,
fmt_found = fmt; fmt_found = fmt;
} }
} }
#if FF_API_NEXT
FF_ENABLE_DEPRECATION_WARNINGS
#endif
return fmt_found; return fmt_found;
} }