[SCM] libav/experimental: Skip some more code that isnt needed for direct MBs.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:59:57 UTC 2013


The following commit has been merged in the experimental branch:
commit f2b3763736705b3459ded5deaed36a674d4f4602
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sat Feb 13 18:23:46 2010 +0000

    Skip some more code that isnt needed for direct MBs.
    
    Originally committed as revision 21798 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index 522a9cf..7e0180a 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -1026,7 +1026,7 @@ static void fill_decode_caches(H264Context *h, int mb_type){
             *(uint32_t*)h->mv_cache [list][scan8[4 ]]=
             *(uint32_t*)h->mv_cache [list][scan8[12]]= 0;
 
-            if( CABAC ) {
+            if( CABAC && !IS_DIRECT(mb_type)) {
                 /* XXX beurk, Load mvd */
                 if(USES_LIST(top_type, list)){
                     const int b_xy= h->mb2b_xy[top_xy] + 3*h->b_stride;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list