[FFmpeg-cvslog] r10696 - in trunk: Changelog libavcodec/h264.c libavcodec/h264.h

[cehoyos]

Author: cehoyos
Date: Tue Oct  9 14:28:17 2007
New Revision: 10696

Log:
Enable PAFF decoding

Modified:
   trunk/Changelog
   trunk/libavcodec/h264.c
   trunk/libavcodec/h264.h

Modified: trunk/Changelog
==============================================================================
--- trunk/Changelog	(original)
+++ trunk/Changelog	Tue Oct  9 14:28:17 2007
@@ -98,6 +98,7 @@ version <next>
 - additional SPARC (VIS) optimizations
 - AMV audio and video decoder
 - DNxHD encoder
+- H.264 PAFF decoding
 
 version 0.4.9-pre1:
 

Modified: trunk/libavcodec/h264.c
==============================================================================
--- trunk/libavcodec/h264.c	(original)
+++ trunk/libavcodec/h264.c	Tue Oct  9 14:28:17 2007
@@ -3989,7 +3989,6 @@ static int decode_slice_header(H264Conte
     }else{
         if(get_bits1(&s->gb)) { //field_pic_flag
             s->picture_structure= PICT_TOP_FIELD + get_bits1(&s->gb); //bottom_field_flag
-            av_log(h->s.avctx, AV_LOG_ERROR, "PAFF interlacing is not implemented\n");
         } else {
             s->picture_structure= PICT_FRAME;
             h->mb_aff_frame = h->sps.mb_aff;

Modified: trunk/libavcodec/h264.h
==============================================================================
--- trunk/libavcodec/h264.h	(original)
+++ trunk/libavcodec/h264.h	Tue Oct  9 14:28:17 2007
@@ -59,7 +59,7 @@
 #define MB_MBAFF h->mb_mbaff
 #define MB_FIELD h->mb_field_decoding_flag
 #define FRAME_MBAFF h->mb_aff_frame
-#define FIELD_PICTURE 0
+#define FIELD_PICTURE (s->picture_structure != PICT_FRAME)
 #else
 #define MB_MBAFF 0
 #define MB_FIELD 0