avformat/movenc: check that the video resolution is supported
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 8 Jul 2014 14:17:44 +0000 (16:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 8 Jul 2014 14:17:44 +0000 (16:17 +0200)
Resolutions are stored as 16bit integers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/movenc.c

index bb51574..919ae58 100644 (file)
@@ -4034,6 +4034,11 @@ static int mov_write_header(AVFormatContext *s)
                 while(track->timescale < 10000)
                     track->timescale *= 2;
             }
+            if (st->codec->width > 65535 || st->codec->height > 65535) {
+                av_log(s, AV_LOG_ERROR, "Resolution %dx%d too large for mov/mp4\n", st->codec->width, st->codec->height);
+                ret = AVERROR(EINVAL);
+                goto error;
+            }
             if (track->mode == MODE_MOV && track->timescale > 100000)
                 av_log(s, AV_LOG_WARNING,
                        "WARNING codec timebase is very high. If duration is too long,\n"