xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-24 12:09:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix vp5/vp6 decoding by using new prototype for decode function

Browse Source 
Originally committed as revision 18352 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2009-04-07 18:24:47 +00:00
parent 7a00bbad21
commit 012f930855
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/vp56.c
View File

@ -495,11 +495,12 @@ static int vp56_size_changed(AVCodecContext *avctx)
} }
int vp56_decode_frame(AVCodecContext *avctx, void *data, int *data_size, int vp56_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
const uint8_t *buf, int buf_size) AVPacket *avpkt)
{ {
const uint8_t *buf = avpkt->data;
VP56Context *s = avctx->priv_data; VP56Context *s = avctx->priv_data;
AVFrame *const p = s->framep[VP56_FRAME_CURRENT]; AVFrame *const p = s->framep[VP56_FRAME_CURRENT];
int remaining_buf_size = buf_size; int remaining_buf_size = avpkt->size;
int is_alpha, av_uninit(alpha_offset); int is_alpha, av_uninit(alpha_offset);
if (s->has_alpha) { if (s->has_alpha) {
@ -641,7 +642,7 @@ int vp56_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
*(AVFrame*)data = *p; *(AVFrame*)data = *p;
*data_size = sizeof(AVFrame); *data_size = sizeof(AVFrame);
return buf_size; return avpkt->size;
} }
av_cold void vp56_init(AVCodecContext *avctx, int flip, int has_alpha) av_cold void vp56_init(AVCodecContext *avctx, int flip, int has_alpha)

2
libavcodec/vp56.h
View File

@ -172,7 +172,7 @@ void vp56_init(AVCodecContext *avctx, int flip, int has_alpha);
int vp56_free(AVCodecContext *avctx); int vp56_free(AVCodecContext *avctx);
void vp56_init_dequant(VP56Context *s, int quantizer); void vp56_init_dequant(VP56Context *s, int quantizer);
int vp56_decode_frame(AVCodecContext *avctx, void *data, int *data_size, int vp56_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
const uint8_t *buf, int buf_size); AVPacket *avpkt);
/** /**