From 55429b553429b9c2f3f16e1b5d5038c8b6f45d9f Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 19 Nov 2004 20:49:12 +0000
Subject: [PATCH] workaround apps which dont provided correctly padded streams

Originally committed as revision 3695 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/mjpeg.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/mjpeg.c b/libavcodec/mjpeg.c
index 6f1b908e97..d281b063db 100644
--- a/libavcodec/mjpeg.c
+++ b/libavcodec/mjpeg.c
@@ -1832,9 +1832,9 @@ static int mjpeg_decode_frame(AVCodecContext *avctx,
 			*(dst++) = x;
 			if (x == 0xff)
 			{
-			    while(*src == 0xff) src++;
+                            while(src<buf_end && x == 0xff)
+                                x = *(src++);
 
-			    x = *(src++);
 			    if (x >= 0xd0 && x <= 0xd7)
 				*(dst++) = x;
 			    else if (x)