[SCM] libav/experimental: Correct comment in the direct mode code. (note, yes this is unrelated to the previous simplification, the code always behaved like it is documented now.)

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


The following commit has been merged in the experimental branch:
commit 53c193a9b06c0e6ffee9b5b35ee0cc8be3c24604
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sun Sep 21 23:49:53 2008 +0000

    Correct comment in the direct mode code.
    (note, yes this is unrelated to the previous simplification, the
     code always behaved like it is documented now.)
    
    Originally committed as revision 15378 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index f188d5b..81f7e75 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -987,7 +987,7 @@ static inline void pred_direct_motion(H264Context * const h, int *mb_type){
 #define MB_TYPE_16x16_OR_INTRA (MB_TYPE_16x16|MB_TYPE_INTRA4x4|MB_TYPE_INTRA16x16|MB_TYPE_INTRA_PCM)
 
     if(IS_INTERLACED(h->ref_list[1][0].mb_type[mb_xy])){ // AFL/AFR/FR/FL -> AFL/FL
-            if(!IS_INTERLACED(*mb_type)){                //     AFR/FR    -> AFL
+        if(!IS_INTERLACED(*mb_type)){                    //     AFR/FR    -> AFL/FL
                 int cur_poc = s->current_picture_ptr->poc;
                 int *col_poc = h->ref_list[1]->field_poc;
                 int col_parity = FFABS(col_poc[0] - cur_poc) >= FFABS(col_poc[1] - cur_poc);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list