har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

invert condition to simplify code

Browse Source 
Originally committed as revision 18365 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2009-04-07 22:25:11 +00:00
parent cf9ce6a3d6
commit 6452af7a33
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/movenc.c
View File

@ -601,11 +601,9 @@ static int ipod_get_codec_tag(AVFormatContext *s, MOVTrack *track)
{ {
int tag = track->enc->codec_tag; int tag = track->enc->codec_tag;
if (track->enc->codec_type == CODEC_TYPE_SUBTITLE && if (!(track->enc->codec_type == CODEC_TYPE_SUBTITLE &&
(tag == MKTAG('t','x','3','g') || (tag == MKTAG('t','x','3','g') ||
tag == MKTAG('t','e','x','t'))) tag == MKTAG('t','e','x','t')))
track->tag = tag; // keep original tag
else
tag = codec_get_tag(codec_ipod_tags, track->enc->codec_id); tag = codec_get_tag(codec_ipod_tags, track->enc->codec_id);
if (!match_ext(s->filename, "m4a") && !match_ext(s->filename, "m4v")) if (!match_ext(s->filename, "m4a") && !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 "