From 6f1c8d4eafabd914b87e9171bf4d04f4ef9160ea Mon Sep 17 00:00:00 2001 From: Miguel Freitas Date: Wed, 8 Jan 2003 13:18:42 +0000 Subject: syncing ffmpeg (with some compilation fixes) - fixes wma bugs - mace, huffyuv and mp3 decoders imported (but not enabled) tested: wma (v1 and v2), mpeg4, msmpeg4 v1, v2 and v3, divx3, divx4, divx5, xvid and dv decoders. everything looks fine. CVS patchset: 3828 CVS date: 2003/01/08 13:18:42 --- src/libffmpeg/libavcodec/dv.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/libffmpeg/libavcodec/dv.c') diff --git a/src/libffmpeg/libavcodec/dv.c b/src/libffmpeg/libavcodec/dv.c index 05128aee4..f436caf12 100644 --- a/src/libffmpeg/libavcodec/dv.c +++ b/src/libffmpeg/libavcodec/dv.c @@ -33,7 +33,7 @@ typedef struct DVVideoDecodeContext { int sampling_411; /* 0 = 420, 1 = 411 */ int width, height; UINT8 *current_picture[3]; /* picture structure */ - AVVideoFrame picture; + AVFrame picture; int linesize[3]; DCTELEM block[5*6][64] __align8; UINT8 dv_zigzag[2][64]; @@ -497,7 +497,6 @@ static int dvvideo_decode_frame(AVCodecContext *avctx, { DVVideoDecodeContext *s = avctx->priv_data; int sct, dsf, apt, ds, nb_dif_segs, vs, width, height, i, packet_size; - unsigned size; UINT8 *buf_ptr; const UINT16 *mb_pos_ptr; @@ -595,8 +594,8 @@ static int dvvideo_decode_frame(AVCodecContext *avctx, emms_c(); /* return image */ - *data_size = sizeof(AVVideoFrame); - *(AVVideoFrame*)data= s->picture; + *data_size = sizeof(AVFrame); + *(AVFrame*)data= s->picture; avctx->release_buffer(avctx, &s->picture); -- cgit v1.2.3