Commit e7e017d5 authored by bcoudurier's avatar bcoudurier

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

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@23396 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent c308d07d
...@@ -1850,6 +1850,8 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ ...@@ -1850,6 +1850,8 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
h->sps.num_units_in_tick, den, 1<<30); h->sps.num_units_in_tick, den, 1<<30);
} }
s->avctx->pix_fmt = s->avctx->get_format(s->avctx, 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 ? s->avctx->color_range == AVCOL_RANGE_JPEG ?
hwaccel_pixfmt_list_h264_jpeg_420 : hwaccel_pixfmt_list_h264_jpeg_420 :
ff_hwaccel_pixfmt_list_420); ff_hwaccel_pixfmt_list_420);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment