From 5e85298cb50e6fcfbfc6715cbc200ec79334d5c3 Mon Sep 17 00:00:00 2001 From: Oskar Arvidsson <oskar@irock.se> Date: Tue, 29 Mar 2011 17:49:00 +0200 Subject: [PATCH] Enable decoding of high bit depth h264. This patch completes the high bit depth h264 decoding support. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> --- libavcodec/h264.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 020a505a69..c9f2ad9f17 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2317,12 +2317,23 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ av_reduce(&s->avctx->time_base.num, &s->avctx->time_base.den, h->sps.num_units_in_tick, den, 1<<30); } + + switch (h->sps.bit_depth_luma) { + case 9 : + s->avctx->pix_fmt = PIX_FMT_YUV420P9; + break; + case 10 : + s->avctx->pix_fmt = PIX_FMT_YUV420P10; + break; + default: 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); + } + s->avctx->hwaccel = ff_find_hwaccel(s->avctx->codec->id, s->avctx->pix_fmt); if (MPV_common_init(s) < 0){