[SCM] libav/experimental: Do not reject odd width/height. Fixes issue371.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:21:40 UTC 2013


The following commit has been merged in the experimental branch:
commit 16e30b7a04025c83049dad134a71097bea14dc2f
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sun May 25 13:31:07 2008 +0000

    Do not reject odd width/height.
    Fixes issue371.
    
    Originally committed as revision 13377 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index 86e1334..8133b1d 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -1966,8 +1966,7 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx,
 
     width = get_bits(&s->gb, 12);
     height = get_bits(&s->gb, 12);
-    if (width <= 0 || height <= 0 ||
-        (width % 2) != 0 || (height % 2) != 0)
+    if (width <= 0 || height <= 0)
         return -1;
     s->aspect_ratio_info= get_bits(&s->gb, 4);
     if (s->aspect_ratio_info == 0) {

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list