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

4
libavcodec/eatgq.c
View File

@@ -189,7 +189,7 @@ static void tgq_calculate_qtable(TgqContext *s, int quant){
}
static int tgq_decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
void *data, int *got_frame,
AVPacket *avpkt){
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
@@ -234,7 +234,7 @@ static int tgq_decode_frame(AVCodecContext *avctx,
if (tgq_decode_mb(s, y, x) < 0)
return AVERROR_INVALIDDATA;
*data_size = sizeof(AVFrame);
*got_frame = 1;
*(AVFrame*)data = s->frame;
return avpkt->size;