diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-08 16:17:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-08 16:17:44 +0200 |
| commit | 5a4edf6f0db78667895546c96d28a7d1c9adfaaa (patch) | |
| tree | 93cfee8b21b8186769ec635c8ab4603fdc93c879 /libavformat/movenc.c | |
| parent | 1f935c3d0b8ca8659974afc02ebdf058dd99cd9c (diff) | |
| download | ffmpeg-5a4edf6f0db78667895546c96d28a7d1c9adfaaa.tar.gz | |
avformat/movenc: check that the video resolution is supported
Resolutions are stored as 16bit integers
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/movenc.c')
| -rw-r--r-- | libavformat/movenc.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index bb515747ad..919ae58ca0 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -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" |