[FFmpeg-devel] [PATCH] Enable PAFF decoding

[Jeff Downs]

On Wed, 10 Oct 2007, Loren Merritt wrote:
[...]
 
> PAFF + spatial direct isn't implemented either.

OK, well if that is the case the check is still not good (and the error  
misleading).

Attached will correct the check and warning for now, until someone gets to 
properly implementing this.

	-Jeff
-------------- next part --------------
Index: libavcodec/h264.c
===================================================================
--- libavcodec/h264.c	(revision 10712)
+++ libavcodec/h264.c	(working copy)
@@ -4098,8 +4098,8 @@
     if(h->slice_type == P_TYPE || h->slice_type == SP_TYPE || h->slice_type == B_TYPE){
         if(h->slice_type == B_TYPE){
             h->direct_spatial_mv_pred= get_bits1(&s->gb);
-            if(h->sps.mb_aff && h->direct_spatial_mv_pred)
-                av_log(h->s.avctx, AV_LOG_ERROR, "MBAFF + spatial direct mode is not implemented\n");
+            if(FIELD_OR_MBAFF_PICTURE && h->direct_spatial_mv_pred)
+                av_log(h->s.avctx, AV_LOG_ERROR, "Interlaced pictures + spatial direct mode is not implemented\n");
         }
         num_ref_idx_active_override_flag= get_bits1(&s->gb);