[SCM] libav/experimental: Simple refactoring to resolve a FIXME. Patch by Paul Kendall.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 4a1aa38bdaccf72374937617912d07a3d173dcf1
Author: Paul Kendall <paul at kcbbs.gen.nz>
Date:   Sat Jul 26 15:07:04 2008 +0000

    Simple refactoring to resolve a FIXME.  Patch by Paul Kendall.
    
    Originally committed as revision 14419 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 99785d0..6adc1e3 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2911,7 +2911,6 @@ static int decode_ref_pic_list_reordering(H264Context *h){
 
     print_short_term(h);
     print_long_term(h);
-    if(h->slice_type_nos==FF_I_TYPE) return 0; //FIXME move before function
 
     for(list=0; list<h->list_count; list++){
         memcpy(h->ref_list[list], h->default_ref_list[list], sizeof(Picture)*h->ref_count[list]);
@@ -3988,7 +3987,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
         fill_default_ref_list(h);
     }
 
-    if(decode_ref_pic_list_reordering(h) < 0)
+    if(h->slice_type_nos!=FF_I_TYPE && decode_ref_pic_list_reordering(h) < 0)
         return -1;
 
     if(   (h->pps.weighted_pred          && h->slice_type_nos == FF_P_TYPE )

-- 
Libav/FFmpeg packaging