[SCM] libav/experimental: Fix dist_scale_factor for long term reference pictures.

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


The following commit has been merged in the experimental branch:
commit 4c0d57bdef599c3e70e06208269f8586a05c301e
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Mon Aug 4 11:17:22 2008 +0000

    Fix dist_scale_factor for long term reference pictures.
    
    Originally committed as revision 14536 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 5de23da..b90db49 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -880,7 +880,7 @@ static inline void direct_dist_scale_factor(H264Context * const h){
     for(i=0; i<h->ref_count[0]; i++){
         int poc0 = h->ref_list[0][i].poc;
         int td = av_clip(poc1 - poc0, -128, 127);
-        if(td == 0 /* FIXME || pic0 is a long-term ref */){
+        if(td == 0 || h->ref_list[0][i].long_ref){
             h->dist_scale_factor[i] = 256;
         }else{
             int tb = av_clip(poc - poc0, -128, 127);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list