summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libavcodec/mpeg12.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index c5b39e1c92..7250226fd3 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -1858,6 +1858,12 @@ static int mpeg_decode_slice(AVCodecContext *avctx,
}
}else{ //second field
int i;
+
+ if(!s->current_picture_ptr){
+ fprintf(stderr, "first field missing\n");
+ return -1;
+ }
+
for(i=0; i<4; i++){
s->current_picture.data[i] = s->current_picture_ptr->data[i];
if(s->picture_structure == PICT_BOTTOM_FIELD){
@@ -2266,6 +2272,8 @@ static int mpeg_decode_frame(AVCodecContext *avctx,
/* skip everything if we are in a hurry>=5 */
if(avctx->hurry_up>=5) break;
+ if (!s->mpeg_enc_ctx_allocated) break;
+
ret = mpeg_decode_slice(avctx, picture,
start_code, s->buffer, input_size);