diff options
| author | Michael Niedermayer | 2012-12-05 17:15:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer | 2012-12-05 17:20:19 +0100 |
| commit | fc1152de410323cf41dedd0bf301a6a265b0850f (patch) | |
| tree | 38341f1e990ea51bf52fa2f3474cdc7757fefd0f /libavcodec/bethsoftvideo.c | |
| parent | 022553e875094565417d32b82975f56be8384820 (diff) | |
| parent | df9b9567518f2840d79a4a96b447ebe1aa326408 (diff) | |
Merge commit 'df9b9567518f2840d79a4a96b447ebe1aa326408'
* commit 'df9b9567518f2840d79a4a96b447ebe1aa326408':
lavc: fix decode_frame() third parameter semantics for video decoders
Conflicts:
libavcodec/cscd.c
libavcodec/eamad.c
libavcodec/ffv1dec.c
libavcodec/gifdec.c
libavcodec/h264.c
libavcodec/iff.c
libavcodec/mjpegdec.c
libavcodec/pcx.c
libavcodec/vp56.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/bethsoftvideo.c')
| -rw-r--r-- | libavcodec/bethsoftvideo.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/bethsoftvideo.c b/libavcodec/bethsoftvideo.c index 8eec5b7253..04243ed33a 100644 --- a/libavcodec/bethsoftvideo.c +++ b/libavcodec/bethsoftvideo.c @@ -65,7 +65,7 @@ static int set_palette(BethsoftvidContext *ctx) } static int bethsoftvid_decode_frame(AVCodecContext *avctx, - void *data, int *data_size, + void *data, int *got_frame, AVPacket *avpkt) { BethsoftvidContext * vid = avctx->priv_data; @@ -97,7 +97,7 @@ static int bethsoftvid_decode_frame(AVCodecContext *avctx, switch(block_type = bytestream2_get_byte(&vid->g)){ case PALETTE_BLOCK: { - *data_size = 0; + *got_frame = 0; if ((ret = set_palette(vid)) < 0) { av_log(avctx, AV_LOG_ERROR, "error reading palette\n"); return ret; @@ -138,7 +138,7 @@ static int bethsoftvid_decode_frame(AVCodecContext *avctx, } end: - *data_size = sizeof(AVFrame); + *got_frame = 1; *(AVFrame*)data = vid->frame; return avpkt->size; |