Skip the fill_colmap() case thats for MBAFF if we dont have an MBAFF frame.

Originally committed as revision 21667 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c
index 65fbd23..0dcf28f 100644 (file)
--- a/libavcodec/h264_direct.c
+++ b/libavcodec/h264_direct.c
@@ -131,6 +131,7 @@ void ff_h264_direct_ref_list_init(H264Context * const h){
 
     for(list=0; list<2; list++){
         fill_colmap(h, h->map_col_to_list0, list, sidx, ref1sidx, 0);
+        if(FRAME_MBAFF)
         for(field=0; field<2; field++)
             fill_colmap(h, h->map_col_to_list0_field[field], list, field, field, 1);
     }