aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2009-04-07 22:25:11 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2009-04-07 22:25:11 +0000
commit6452af7a3350e630ec4cab3e64bd1f6deb1d48d1 (patch)
tree5d77ac4efbc158964ff7af12c92ab6caff7139f5
parentcf9ce6a3d69e4f29b212f01564bc4785fdfd2c66 (diff)
downloadffmpeg-6452af7a3350e630ec4cab3e64bd1f6deb1d48d1.tar.gz
invert condition to simplify code
Originally committed as revision 18365 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/movenc.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 38290bb64d..e96e570317 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 "