[SCM] libav/experimental: Set MpegEncContext->mspel flag (here it indicates that bicubic MC will be use)

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:49:28 UTC 2013


The following commit has been merged in the experimental branch:
commit 09be55df9c78c494d597d1a073f4f9ccc0e55cfc
Author: Kostya Shishkov <kostya.shishkov at gmail.com>
Date:   Sat Jul 29 03:11:14 2006 +0000

    Set MpegEncContext->mspel flag (here it indicates that bicubic MC will be use)
    
    Originally committed as revision 5845 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index 3c74939..33a2414 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -1474,6 +1474,7 @@ static int vc1_parse_frame_header(VC1Context *v, GetBitContext* gb)
                 v->s.quarter_sample = 1;
         } else
             v->s.quarter_sample = 1;
+        v->s.mspel = !(v->mv_mode == MV_PMODE_1MV_HPEL_BILIN || (v->mv_mode == MV_PMODE_INTENSITY_COMP && v->mv_mode2 == MV_PMODE_1MV_HPEL_BILIN));
 
         if ((v->mv_mode == MV_PMODE_INTENSITY_COMP &&
                  v->mv_mode2 == MV_PMODE_MIXED_MV)
@@ -1523,6 +1524,7 @@ static int vc1_parse_frame_header(VC1Context *v, GetBitContext* gb)
         lowquant = (v->pq > 12) ? 0 : 1;
         v->mv_mode = get_bits1(gb) ? MV_PMODE_1MV : MV_PMODE_1MV_HPEL_BILIN;
         v->s.quarter_sample = (v->mv_mode == MV_PMODE_1MV);
+        v->s.mspel = v->s.quarter_sample;
 
         status = bitplane_decoding(v->direct_mb_plane, &v->dmb_is_raw, v);
         if (status < 0) return -1;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list