OSDN Git Service

Revert r13542: Spatial direct mode probably also works with PAFF.
authorCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>
Mon, 21 Jul 2008 22:46:47 +0000 (22:46 +0000)
committerCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>
Mon, 21 Jul 2008 22:46:47 +0000 (22:46 +0000)
Originally committed as revision 14332 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/h264.c

index e429f86..06d4947 100644 (file)
@@ -4117,8 +4117,6 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
     if(h->slice_type_nos != FF_I_TYPE){
         if(h->slice_type_nos == FF_B_TYPE){
             h->direct_spatial_mv_pred= get_bits1(&s->gb);
-            if(FIELD_PICTURE && h->direct_spatial_mv_pred)
-                av_log(h->s.avctx, AV_LOG_ERROR, "PAFF + spatial direct mode is not implemented\n");
         }
         num_ref_idx_active_override_flag= get_bits1(&s->gb);