generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'df9b9567518f2840d79a4a96b447ebe1aa326408'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2012-12-05 17:15:57 +01:00
parent 022553e875 df9b956751
commit fc1152de41
133 changed files with 306 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/libopenjpegdec.c
View File

@@ -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: