summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArpi <arpi@thot.banki.hu>2002-07-11 23:34:06 +0000
committerArpi <arpi@thot.banki.hu>2002-07-11 23:34:06 +0000
commitd85c5979d083f79b0cbfdb2e42b3c44a8d09b2ce (patch)
tree4380a2dc5182e72cf1e51593aabdb5bd46409f1b
parent14ac09bfabd6514d1f167f1815d1c1fee87ac78c (diff)
don't exit decoder after decoding first field -> fixes angels.avi interlacing
Originally committed as revision 746 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/mjpeg.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/mjpeg.c b/libavcodec/mjpeg.c
index 7068b13078..d5cb0f5396 100644
--- a/libavcodec/mjpeg.c
+++ b/libavcodec/mjpeg.c
@@ -1247,7 +1247,7 @@ static int mjpeg_decode_frame(AVCodecContext *avctx,
s->bottom_field ^= 1;
/* if not bottom field, do not output image yet */
if (s->bottom_field)
- goto the_end;
+ goto not_the_end;
}
for(i=0;i<3;i++) {
picture->data[i] = s->current_picture[i];
@@ -1313,6 +1313,7 @@ static int mjpeg_decode_frame(AVCodecContext *avctx,
#endif
}
}
+ not_the_end:
}
the_end:
return buf_ptr - buf;