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/libopenjpegdec.c | |
| parent | 022553e875094565417d32b82975f56be8384820 (diff) | |
| parent | df9b9567518f2840d79a4a96b447ebe1aa326408 (diff) | |
| download | android_external_ffmpeg-fc1152de410323cf41dedd0bf301a6a265b0850f.tar.gz android_external_ffmpeg-fc1152de410323cf41dedd0bf301a6a265b0850f.tar.bz2 android_external_ffmpeg-fc1152de410323cf41dedd0bf301a6a265b0850f.zip | |
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/libopenjpegdec.c')
| -rw-r--r-- | libavcodec/libopenjpegdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c index 5f3c36bbe5..826a16fb84 100644 --- a/libavcodec/libopenjpegdec.c +++ b/libavcodec/libopenjpegdec.c @@ -230,7 +230,7 @@ static av_cold int libopenjpeg_decode_init_thread_copy(AVCodecContext *avctx) } static int libopenjpeg_decode_frame(AVCodecContext *avctx, - void *data, int *data_size, + void *data, int *got_frame, AVPacket *avpkt) { uint8_t *buf = avpkt->data; @@ -246,7 +246,7 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx, int ispacked = 0; int i; - *data_size = 0; + *got_frame = 0; // Check if input is a raw jpeg2k codestream or in jp2 wrapping if ((AV_RB32(buf) == 12) && @@ -381,7 +381,7 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx, } *output = ctx->image; - *data_size = sizeof(AVPicture); + *got_frame = 1; ret = buf_size; done: |