# HG changeset patch # User michael # Date 1207247107 0 # Node ID 3f6b656f9f0193d8435cb5e5c5ead02fea6b0646 # Parent 2883ce013c20b63c32902a3b63a1f9ec9d4a1482 Factorize code a little. diff -r 2883ce013c20 -r 3f6b656f9f01 mpeg12.c --- a/mpeg12.c Wed Apr 02 21:41:48 2008 +0000 +++ b/mpeg12.c Thu Apr 03 18:25:07 2008 +0000 @@ -2234,16 +2234,16 @@ return END_NOT_FOUND; } +static int decode_chunks(AVCodecContext *avctx, + AVFrame *picture, int *data_size, + const uint8_t *buf, int buf_size); + /* handle buffering and image synchronisation */ static int mpeg_decode_frame(AVCodecContext *avctx, void *data, int *data_size, const uint8_t *buf, int buf_size) { Mpeg1Context *s = avctx->priv_data; - const uint8_t *buf_end; - const uint8_t *buf_ptr; - uint32_t start_code; - int ret, input_size; AVFrame *picture = data; MpegEncContext *s2 = &s->mpeg_enc_ctx; dprintf(avctx, "fill_buffer\n"); @@ -2266,9 +2266,6 @@ return buf_size; } - buf_ptr = buf; - buf_end = buf + buf_size; - #if 0 if (s->repeat_field % 2 == 1) { s->repeat_field++; @@ -2286,9 +2283,22 @@ s->slice_count= 0; + return decode_chunks(avctx, picture, data_size, buf, buf_size); +} + +static int decode_chunks(AVCodecContext *avctx, + AVFrame *picture, int *data_size, + const uint8_t *buf, int buf_size) +{ + Mpeg1Context *s = avctx->priv_data; + MpegEncContext *s2 = &s->mpeg_enc_ctx; + const uint8_t *buf_ptr = buf; + const uint8_t *buf_end = buf + buf_size; + int ret, input_size; + for(;;) { /* find start next code */ - start_code = -1; + uint32_t start_code = -1; buf_ptr = ff_find_start_code(buf_ptr,buf_end, &start_code); if (start_code > 0x1ff){ if(s2->pict_type != FF_B_TYPE || avctx->skip_frame <= AVDISCARD_DEFAULT){