From: Baptiste Coudurier Date: Tue, 7 Apr 2009 22:25:11 +0000 (+0000) Subject: invert condition to simplify code X-Git-Tag: v0.6~4897 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6452af7a3350e630ec4cab3e64bd1f6deb1d48d1;p=coroid%2Fffmpeg_saccubus.git invert condition to simplify code Originally committed as revision 18365 to svn://svn.ffmpeg.org/ffmpeg/trunk --- diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 38290bb64..e96e57031 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -601,11 +601,9 @@ static int ipod_get_codec_tag(AVFormatContext *s, MOVTrack *track) { 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','e','x','t'))) - track->tag = tag; // keep original tag - else tag = codec_get_tag(codec_ipod_tags, track->enc->codec_id); if (!match_ext(s->filename, "m4a") && !match_ext(s->filename, "m4v")) av_log(s, AV_LOG_WARNING, "Warning, extension is not .m4a nor .m4v "