[FFmpeg-cvslog] r18352 - in trunk/libavcodec: vp56.c vp56.h

aurel subversion
Tue Apr 7 20:24:48 CEST 2009


Author: aurel
Date: Tue Apr  7 20:24:47 2009
New Revision: 18352

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

Modified:
   trunk/libavcodec/vp56.c
   trunk/libavcodec/vp56.h

Modified: trunk/libavcodec/vp56.c
==============================================================================
--- trunk/libavcodec/vp56.c	Tue Apr  7 17:59:50 2009	(r18351)
+++ trunk/libavcodec/vp56.c	Tue Apr  7 20:24:47 2009	(r18352)
@@ -495,11 +495,12 @@ static int vp56_size_changed(AVCodecCont
 }
 
 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;
     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);
 
     if (s->has_alpha) {
@@ -641,7 +642,7 @@ int vp56_decode_frame(AVCodecContext *av
     *(AVFrame*)data = *p;
     *data_size = sizeof(AVFrame);
 
-    return buf_size;
+    return avpkt->size;
 }
 
 av_cold void vp56_init(AVCodecContext *avctx, int flip, int has_alpha)

Modified: trunk/libavcodec/vp56.h
==============================================================================
--- trunk/libavcodec/vp56.h	Tue Apr  7 17:59:50 2009	(r18351)
+++ trunk/libavcodec/vp56.h	Tue Apr  7 20:24:47 2009	(r18352)
@@ -172,7 +172,7 @@ void vp56_init(AVCodecContext *avctx, in
 int vp56_free(AVCodecContext *avctx);
 void vp56_init_dequant(VP56Context *s, int quantizer);
 int vp56_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
-                      const uint8_t *buf, int buf_size);
+                      AVPacket *avpkt);
 
 
 /**



More information about the ffmpeg-cvslog mailing list