From d2581dcca6abe74e3fbf44df815194a6aea71bd6 Mon Sep 17 00:00:00 2001
From: Piotr Bandurski <ami_stuff@o2.pl>
Date: Thu, 31 May 2012 13:49:00 +0200
Subject: [PATCH] mjpegenc: add a limit for maximum supported resolution

jpeg does not allow more than 65000 pixels for width and height

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
 libavcodec/mjpegenc.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c
index 9326d4d9f4..53a45b4c4c 100644
--- a/libavcodec/mjpegenc.c
+++ b/libavcodec/mjpegenc.c
@@ -48,6 +48,11 @@ av_cold int ff_mjpeg_encode_init(MpegEncContext *s)
 {
     MJpegContext *m;
 
+    if (s->width > 65500 || s->height > 65500) {
+        av_log(s, AV_LOG_ERROR, "JPEG does not support resolutions above 65500x65500\n");
+        return -1;
+    }
+
     m = av_malloc(sizeof(MJpegContext));
     if (!m)
         return -1;