aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2003-09-27 00:02:29 +0000
committerMichael Niedermayer <michaelni@gmx.at>2003-09-27 00:02:29 +0000
commit80de6a80a9becd080d1d65a084b392aa69d42ef6 (patch)
treebad715ecf6c37133d80f11ca3f39bcf2bb0309c0
parent8b76418a14d035df53e460e00d175be87a5cc332 (diff)
downloadffmpeg-80de6a80a9becd080d1d65a084b392aa69d42ef6.tar.gz
hurry_up fix?
Originally committed as revision 2306 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/mpeg12.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index b92d071503..b2736163c2 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -2453,9 +2453,11 @@ static int mpeg_decode_frame(AVCodecContext *avctx,
/* find start next code */
start_code = find_start_code(&buf_ptr, buf_end);
if (start_code < 0){
- if (slice_end(avctx, picture)) {
- if(s2->last_picture_ptr) //FIXME merge with the stuff in mpeg_decode_slice
- *data_size = sizeof(AVPicture);
+ if(s2->pict_type != B_TYPE || avctx->hurry_up==0){
+ if (slice_end(avctx, picture)) {
+ if(s2->last_picture_ptr) //FIXME merge with the stuff in mpeg_decode_slice
+ *data_size = sizeof(AVPicture);
+ }
}
return FFMAX(0, buf_ptr - buf - s2->parse_context.last_index);
}