Mercurial > libavcodec.hg

changeset 11800:966aa6b53dcf libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Pass codec pixel format list to get_format, if present, fix vdpau decoding
author bcoudurier
date Mon, 31 May 2010 22:01:31 +0000
parents 25ce7aff1e1d
children 026edf66e3a9
files h264.c
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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);