Browse Source

Move mpeg_decode_postinit() out of bitstream decoding functions, it does not

belong in there.

Originally committed as revision 20642 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.6
Michael Niedermayer 16 years ago
parent
commit
bbf266fdb5
1 changed files with 5 additions and 3 deletions
  1. +5
    -3
      libavcodec/mpeg12.c

+ 5
- 3
libavcodec/mpeg12.c View File

@@ -1352,9 +1352,6 @@ static int mpeg1_decode_picture(AVCodecContext *avctx,
MpegEncContext *s = &s1->mpeg_enc_ctx;
int ref, f_code, vbv_delay;

if(mpeg_decode_postinit(s->avctx) < 0)
return -2;

init_get_bits(&s->gb, buf, buf_size*8);

ref = get_bits(&s->gb, 10); /* temporal ref */
@@ -2304,6 +2301,11 @@ static int decode_chunks(AVCodecContext *avctx,
break;

case PICTURE_START_CODE:
if(mpeg_decode_postinit(avctx) < 0){
av_log(avctx, AV_LOG_ERROR, "mpeg_decode_postinit() failure\n");
return -1;
}

/* we have a complete image: we try to decompress it */
if(mpeg1_decode_picture(avctx,
buf_ptr, input_size) < 0)


Loading…
Cancel
Save