diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-05 17:15:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-05 17:20:19 +0100 |
| commit | fc1152de410323cf41dedd0bf301a6a265b0850f (patch) | |
| tree | 38341f1e990ea51bf52fa2f3474cdc7757fefd0f /libavcodec/fraps.c | |
| parent | 022553e875094565417d32b82975f56be8384820 (diff) | |
| parent | df9b9567518f2840d79a4a96b447ebe1aa326408 (diff) | |
| download | ffmpeg-fc1152de410323cf41dedd0bf301a6a265b0850f.tar.gz | |
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/fraps.c')
| -rw-r--r-- | libavcodec/fraps.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/fraps.c b/libavcodec/fraps.c index b624e4b305..6500c853e2 100644 --- a/libavcodec/fraps.c +++ b/libavcodec/fraps.c @@ -125,7 +125,7 @@ static int fraps2_decode_plane(FrapsContext *s, uint8_t *dst, int stride, int w, } static int decode_frame(AVCodecContext *avctx, - void *data, int *data_size, + void *data, int *got_frame, AVPacket *avpkt) { const uint8_t *buf = avpkt->data; @@ -164,7 +164,7 @@ static int decode_frame(AVCodecContext *avctx, needed_size += header_size; /* bit 31 means same as previous pic */ if (header & (1U<<31)) { - *data_size = 0; + *got_frame = 0; return buf_size; } if (buf_size != needed_size) { @@ -176,7 +176,7 @@ static int decode_frame(AVCodecContext *avctx, } else { /* skip frame */ if (buf_size == 8) { - *data_size = 0; + *got_frame = 0; return buf_size; } if (AV_RL32(buf) != FPS_TAG || buf_size < planes*1024 + 24) { @@ -291,7 +291,7 @@ static int decode_frame(AVCodecContext *avctx, } *frame = *f; - *data_size = sizeof(AVFrame); + *got_frame = 1; return buf_size; } |