[SCM] libav/experimental: i263: skip dummy frames

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Aug 10 16:03:31 UTC 2014


The following commit has been merged in the experimental branch:
commit b2290bf10b12b7772f55fcab014a47e18e9fdef2
Author: Dirk Ausserhaus <dausserhaus at gmail.com>
Date:   Wed Jun 18 10:01:52 2014 +0200

    i263: skip dummy frames
    
    Intel i263 codec has special 8-byte dummy frames that should not be decoded,
    so do not even attempt to decode them and skip them instead.
    
    Signed-off-by: Kostya Shishkov <kostya.shishkov at gmail.com>

diff --git a/libavcodec/intelh263dec.c b/libavcodec/intelh263dec.c
index 8a0a381..e34da5c 100644
--- a/libavcodec/intelh263dec.c
+++ b/libavcodec/intelh263dec.c
@@ -26,6 +26,10 @@ int ff_intel_h263_decode_picture_header(MpegEncContext *s)
 {
     int format;
 
+    if (get_bits_left(&s->gb) == 64) { /* special dummy frames */
+        return FRAME_SKIPPED;
+    }
+
     /* picture header */
     if (get_bits_long(&s->gb, 22) != 0x20) {
         av_log(s->avctx, AV_LOG_ERROR, "Bad picture start code\n");

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list