ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-20 05:16:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Originally committed as revision 23396 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2010-05-31 22:01:31 +00:00
parent 879c9d1a63
commit 9ad7dfc110
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h264.c
View File

@ -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);