[FFmpeg-cvslog] prores: skip alpha if present

Jonne Ahner git at videolan.org
Thu Sep 22 06:28:18 CEST 2011


ffmpeg | branch: master | Jonne Ahner <jonne.ahner at gmail.com> | Thu Sep 22 02:40:49 2011 +0200| [8a73246391480bfc79ccca8fa34268b9274e4378] | committer: Michael Niedermayer

prores: skip alpha if present

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8a73246391480bfc79ccca8fa34268b9274e4378
---

 libavcodec/proresdec.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/libavcodec/proresdec.c b/libavcodec/proresdec.c
index 00eb38d..fc7a55b 100644
--- a/libavcodec/proresdec.c
+++ b/libavcodec/proresdec.c
@@ -480,6 +480,7 @@ static int decode_slice_thread(AVCodecContext *avctx, void *arg, int jobnr, int
     y_data_size = AV_RB16(buf + 2);
     u_data_size = AV_RB16(buf + 4);
     v_data_size = slice->data_size - y_data_size - u_data_size - hdr_size;
+    if (hdr_size > 7) v_data_size = AV_RB16(buf + 6);
 
     if (y_data_size < 0 || u_data_size < 0 || v_data_size < 0) {
         av_log(avctx, AV_LOG_ERROR, "invalid plane data size\n");



More information about the ffmpeg-cvslog mailing list