[SCM] libav/experimental: fix crash on negative POC

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:44:07 UTC 2013


The following commit has been merged in the experimental branch:
commit 29860cc88caaf1c4852e5ba18ea15e0516039c14
Author: Loren Merritt <lorenm at u.washington.edu>
Date:   Thu May 19 04:48:06 2005 +0000

    fix crash on negative POC
    
    Originally committed as revision 4278 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 2386c20..cf0580c 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -3156,11 +3156,11 @@ static int fill_default_ref_list(H264Context *h){
     
     if(h->slice_type==B_TYPE){
         int out_i;
-        int limit= -1;
+        int limit= INT_MIN;
 
         /* sort frame according to poc in B slice */
         for(out_i=0; out_i<h->short_ref_count; out_i++){
-            int best_i=-1;
+            int best_i=INT_MIN;
             int best_poc=INT_MAX;
 
             for(i=0; i<h->short_ref_count; i++){
@@ -3171,7 +3171,7 @@ static int fill_default_ref_list(H264Context *h){
                 }
             }
             
-            assert(best_i != -1);
+            assert(best_i != INT_MIN);
             
             limit= best_poc;
             sorted_short_ref[out_i]= *h->short_ref[best_i];

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list