# HG changeset patch # User bcoudurier # Date 1275343291 0 # Node ID 966aa6b53dcf07cbdbfb129fd0cdaaf89dbcbfa3 # Parent 25ce7aff1e1d80e81c22b39f01c52f0eea4e3d2d Pass codec pixel format list to get_format, if present, fix vdpau decoding diff -r 25ce7aff1e1d -r 966aa6b53dcf h264.c --- a/h264.c Sun May 30 23:57:51 2010 +0000 +++ b/h264.c Mon May 31 22:01:31 2010 +0000 @@ -1850,6 +1850,8 @@ 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);