[FFmpeg-cvslog] r14419 - trunk/libavcodec/h264.c

[darkshikari]

Author: darkshikari
Date: Sat Jul 26 17:07:04 2008
New Revision: 14419

Log:
Simple refactoring to resolve a FIXME.  Patch by Paul Kendall.

Modified:
   trunk/libavcodec/h264.c

Modified: trunk/libavcodec/h264.c
==============================================================================
--- trunk/libavcodec/h264.c	(original)
+++ trunk/libavcodec/h264.c	Sat Jul 26 17:07:04 2008
@@ -2911,7 +2911,6 @@ static int decode_ref_pic_list_reorderin
 
     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(H264Conte
         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 )