virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

Use av_match_ext() rather than the deprecated match_ext(), fix

Browse Source 
warnings.

Originally committed as revision 21263 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2010-01-17 15:57:51 +00:00
parent 9a180390b9
commit ade5b91dda
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/movenc.c
View File

@ -647,7 +647,7 @@ static int ipod_get_codec_tag(AVFormatContext *s, MOVTrack *track)
tag == MKTAG('t','e','x','t')))) tag == MKTAG('t','e','x','t'))))
tag = ff_codec_get_tag(codec_ipod_tags, track->enc->codec_id); tag = ff_codec_get_tag(codec_ipod_tags, track->enc->codec_id);
if (!match_ext(s->filename, "m4a") && !match_ext(s->filename, "m4v")) if (!av_match_ext(s->filename, "m4a") && !av_match_ext(s->filename, "m4v"))
av_log(s, AV_LOG_WARNING, "Warning, extension is not .m4a nor .m4v " av_log(s, AV_LOG_WARNING, "Warning, extension is not .m4a nor .m4v "
"Quicktime/Ipod might not play the file\n"); "Quicktime/Ipod might not play the file\n");

2
libavformat/nsvdec.c
View File

@ -764,7 +764,7 @@ static int nsv_probe(AVProbeData *p)
return AVPROBE_SCORE_MAX-20; return AVPROBE_SCORE_MAX-20;
} }
/* so we'll have more luck on extension... */ /* so we'll have more luck on extension... */
if (match_ext(p->filename, "nsv")) if (av_match_ext(p->filename, "nsv"))
return AVPROBE_SCORE_MAX/2; return AVPROBE_SCORE_MAX/2;
/* FIXME: add mime-type check */ /* FIXME: add mime-type check */
return 0; return 0;