[FFmpeg-cvslog] r18365 - trunk/libavformat/movenc.c

bcoudurier subversion
Wed Apr 8 00:25:11 CEST 2009


Author: bcoudurier
Date: Wed Apr  8 00:25:11 2009
New Revision: 18365

Log:
invert condition to simplify code

Modified:
   trunk/libavformat/movenc.c

Modified: trunk/libavformat/movenc.c
==============================================================================
--- trunk/libavformat/movenc.c	Wed Apr  8 00:23:15 2009	(r18364)
+++ trunk/libavformat/movenc.c	Wed Apr  8 00:25:11 2009	(r18365)
@@ -601,11 +601,9 @@ static int ipod_get_codec_tag(AVFormatCo
 {
     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 "



More information about the ffmpeg-cvslog mailing list