diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2010-05-31 22:01:31 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2010-05-31 22:01:31 +0000 |
| commit | 9ad7dfc110de1c7540d5050c1d4f075f57cb9f7a (patch) | |
| tree | 7be75f4f6f855d6eb4348a2bd8418d8cd72f02bf /libavcodec | |
| parent | 879c9d1a632cfd374d50a6d341c7e83ccc22b060 (diff) | |
| download | ffmpeg-9ad7dfc110de1c7540d5050c1d4f075f57cb9f7a.tar.gz | |
Pass codec pixel format list to get_format, if present, fix vdpau decoding
Originally committed as revision 23396 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index e4eb232ea1..ef0999617a 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1850,6 +1850,8 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ 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); |