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/libschroedingerdec.c | |
| parent | 022553e875094565417d32b82975f56be8384820 (diff) | |
| parent | df9b9567518f2840d79a4a96b447ebe1aa326408 (diff) | |
| download | ffmpeg-streaming-fc1152de410323cf41dedd0bf301a6a265b0850f.zip ffmpeg-streaming-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/libschroedingerdec.c')
| -rw-r--r-- | libavcodec/libschroedingerdec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/libschroedingerdec.c b/libavcodec/libschroedingerdec.c index c98b499..bce0271 100644 --- a/libavcodec/libschroedingerdec.c +++ b/libavcodec/libschroedingerdec.c @@ -203,7 +203,7 @@ static void libschroedinger_handle_first_access_unit(AVCodecContext *avccontext) } static int libschroedinger_decode_frame(AVCodecContext *avccontext, - void *data, int *data_size, + void *data, int *got_frame, AVPacket *avpkt) { const uint8_t *buf = avpkt->data; @@ -221,7 +221,7 @@ static int libschroedinger_decode_frame(AVCodecContext *avccontext, SchroParseUnitContext parse_ctx; LibSchroFrameContext *framewithpts = NULL; - *data_size = 0; + *got_frame = 0; parse_context_init(&parse_ctx, buf, buf_size); if (!buf_size) { @@ -337,14 +337,14 @@ static int libschroedinger_decode_frame(AVCodecContext *avccontext, p_schro_params->dec_frame.linesize[2] = framewithpts->frame->components[2].stride; *(AVFrame*)data = p_schro_params->dec_frame; - *data_size = sizeof(AVFrame); + *got_frame = 1; /* Now free the frame resources. */ libschroedinger_decode_frame_free(framewithpts->frame); av_free(framewithpts); } else { data = NULL; - *data_size = 0; + *got_frame = 0; } return buf_size; } |
