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

[bcoudurier]

Author: bcoudurier
Date: Tue Jun  1 00:01:31 2010
New Revision: 23396

Log:
Pass codec pixel format list to get_format, if present, fix vdpau decoding

Modified:
   trunk/libavcodec/h264.c

Modified: trunk/libavcodec/h264.c
==============================================================================
--- trunk/libavcodec/h264.c	Mon May 31 23:49:53 2010	(r23395)
+++ trunk/libavcodec/h264.c	Tue Jun  1 00:01:31 2010	(r23396)
@@ -1850,6 +1850,8 @@ static int decode_slice_header(H264Conte
                       h->sps.num_units_in_tick, den, 1<<30);
         }
         s->avctx->pix_fmt = s->avctx->get_format(s->avctx,
+                                                 s->avctx->codec->pix_fmts ?
+                                                 s->avctx->codec->pix_fmts :
                                                  s->avctx->color_range == AVCOL_RANGE_JPEG ?
                                                  hwaccel_pixfmt_list_h264_jpeg_420 :
                                                  ff_hwaccel_pixfmt_list_420);