Imported Debian version 2.5.3~trusty1

[deb_ffmpeg.git] / ffmpeg / libavformat / movenc.c

diff --git a/ffmpeg/libavformat/movenc.c b/ffmpeg/libavformat/movenc.c
index 10e883c923470c38a7e9060480a20b6adbcb4ec2..ef250412b935de1992a127431eef0a890ce34e2a 100644 (file)
--- a/ffmpeg/libavformat/movenc.c
+++ b/ffmpeg/libavformat/movenc.c
@@ -2499,7 +2499,8 @@ static int mov_write_mvhd_tag(AVIOContext *pb, MOVMuxContext *mov)
     }
 
     version = max_track_len < UINT32_MAX ? 0 : 1;
-    (version == 1) ? avio_wb32(pb, 120) : avio_wb32(pb, 108); /* size */
+    avio_wb32(pb, version == 1 ? 120 : 108); /* size */
+
     ffio_wfourcc(pb, "mvhd");
     avio_w8(pb, version);
     avio_wb24(pb, 0); /* flags */