OSDN Git Service

invert condition to simplify code
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>
Tue, 7 Apr 2009 22:25:11 +0000 (22:25 +0000)
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>
Tue, 7 Apr 2009 22:25:11 +0000 (22:25 +0000)
Originally committed as revision 18365 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavformat/movenc.c

index 38290bb..e96e570 100644 (file)
@@ -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 "