Mercurial > libavcodec.hg
diff mpeg12.c @ 925:7fccaa0d699d libavcodec
AVVideoFrame -> AVFrame
author | michaelni |
---|---|
date | Mon, 09 Dec 2002 12:03:43 +0000 |
parents | 3814e9115672 |
children | 6bcb214d6a17 |
line wrap: on
line diff
--- a/mpeg12.c Mon Dec 09 00:29:17 2002 +0000 +++ b/mpeg12.c Mon Dec 09 12:03:43 2002 +0000 @@ -1595,7 +1595,7 @@ * DECODE_SLICE_EOP if the end of the picture is reached */ static int mpeg_decode_slice(AVCodecContext *avctx, - AVVideoFrame *pict, + AVFrame *pict, int start_code, UINT8 *buf, int buf_size) { @@ -1703,7 +1703,7 @@ MPV_frame_end(s); if (s->pict_type == B_TYPE || s->low_delay) { - *pict= *(AVVideoFrame*)&s->current_picture; + *pict= *(AVFrame*)&s->current_picture; } else { s->picture_number++; /* latency of 1 frame for I and P frames */ @@ -1711,7 +1711,7 @@ if (s->picture_number == 1) { return DECODE_SLICE_OK; } else { - *pict= *(AVVideoFrame*)&s->last_picture; + *pict= *(AVFrame*)&s->last_picture; } } return DECODE_SLICE_EOP; @@ -1839,7 +1839,7 @@ Mpeg1Context *s = avctx->priv_data; UINT8 *buf_end, *buf_ptr, *buf_start; int len, start_code_found, ret, code, start_code, input_size; - AVVideoFrame *picture = data; + AVFrame *picture = data; MpegEncContext *s2 = &s->mpeg_enc_ctx; dprintf("fill_buffer\n"); @@ -1849,9 +1849,9 @@ /* special case for last picture */ if (buf_size == 0) { if (s2->picture_number > 0) { - *picture= *(AVVideoFrame*)&s2->next_picture; + *picture= *(AVFrame*)&s2->next_picture; - *data_size = sizeof(AVVideoFrame); + *data_size = sizeof(AVFrame); } return 0; }