diff options
| author | Mike Melanson <mike@multimedia.cx> | 2003-06-19 00:47:19 +0000 |
|---|---|---|
| committer | Mike Melanson <mike@multimedia.cx> | 2003-06-19 00:47:19 +0000 |
| commit | 6f3b07176ae833429586bf9d27c8477db9efa7a7 (patch) | |
| tree | acba2593ed69e5a2aaa96aea9215948459d8ea8f /src/libffmpeg/libavcodec/cyuv.c | |
| parent | c52df867db2f177dcabbbbe2b93517c9bf4f8ae1 (diff) | |
| download | xine-lib-6f3b07176ae833429586bf9d27c8477db9efa7a7.tar.gz xine-lib-6f3b07176ae833429586bf9d27c8477db9efa7a7.tar.bz2 | |
maintenance ffmpeg sync: import and activate decoders for 4X and
RealAudio codecs; import VP3 decoder but leave de-activated; fixes for
SVQ3 bugs; more conditional compilation for encoders
CVS patchset: 5067
CVS date: 2003/06/19 00:47:19
Diffstat (limited to 'src/libffmpeg/libavcodec/cyuv.c')
| -rw-r--r-- | src/libffmpeg/libavcodec/cyuv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libffmpeg/libavcodec/cyuv.c b/src/libffmpeg/libavcodec/cyuv.c index 1bf676a43..d1a6eabf2 100644 --- a/src/libffmpeg/libavcodec/cyuv.c +++ b/src/libffmpeg/libavcodec/cyuv.c @@ -37,7 +37,6 @@ #include "avcodec.h" #include "dsputil.h" #include "mpegvideo.h" -#include "bswap.h" typedef struct CyuvDecodeContext { @@ -98,6 +97,9 @@ static int cyuv_decode_frame(AVCodecContext *avctx, /* pixel data starts 48 bytes in, after 3x16-byte tables */ stream_ptr = 48; + if(s->frame.data[0]) + avctx->release_buffer(avctx, &s->frame); + s->frame.reference = 0; if(avctx->get_buffer(avctx, &s->frame) < 0) { fprintf(stderr, "get_buffer() failed\n"); @@ -159,8 +161,6 @@ static int cyuv_decode_frame(AVCodecContext *avctx, *data_size=sizeof(AVFrame); *(AVFrame*)data= s->frame; - avctx->release_buffer(avctx, &s->frame); - return buf_size; } |