[SCM] libav/experimental: 10l fix h263+ encoder, format will be 8, array size is 8 not 7

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:17:56 UTC 2013


The following commit has been merged in the experimental branch:
commit 12a5150bf439ff79c541c3dd7be41cede335c1b8
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Thu Oct 21 06:21:07 2010 +0000

    10l fix h263+ encoder, format will be 8, array size is 8 not 7
    
    Originally committed as revision 25532 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c
index 2537838..ee0e0de 100644
--- a/libavcodec/ituh263enc.c
+++ b/libavcodec/ituh263enc.c
@@ -162,7 +162,7 @@ void h263_encode_picture_header(MpegEncContext * s, int picture_number)
 
         put_bits(&s->pb, 3, 7);
         put_bits(&s->pb,3,ufep); /* Update Full Extended PTYPE */
-        if (format == 7)
+        if (format == 8)
             put_bits(&s->pb,3,6); /* Custom Source Format */
         else
             put_bits(&s->pb, 3, format);
@@ -192,7 +192,7 @@ void h263_encode_picture_header(MpegEncContext * s, int picture_number)
         /* This should be here if PLUSPTYPE */
         put_bits(&s->pb, 1, 0); /* Continuous Presence Multipoint mode: off */
 
-                if (format == 7) {
+                if (format == 8) {
             /* Custom Picture Format (CPFMT) */
             s->aspect_ratio_info= ff_h263_aspect_to_info(s->avctx->sample_aspect_ratio);
 

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list