diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-21 11:51:26 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-21 11:51:26 +0100 |
commit | 82f95d7fd7c0e99a59163e6d14c35cc11bb7f9d7 (patch) | |
tree | 4aaff3a7c83772fc35d5280b9eba1fa21951fc87 /libavcodec/h264.c | |
parent | c5b484e6162c028361a2f6f545009828acf3984c (diff) | |
download | ffmpeg-streaming-82f95d7fd7c0e99a59163e6d14c35cc11bb7f9d7.zip ffmpeg-streaming-82f95d7fd7c0e99a59163e6d14c35cc11bb7f9d7.tar.gz |
h264: drop special case for 9bit chroma422
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
-rw-r--r-- | libavcodec/h264.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 2f58390..bb866b6 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2960,8 +2960,7 @@ static int h264_set_parameter_from_sps(H264Context *h) return AVERROR_INVALIDDATA; } if (h->sps.bit_depth_luma >= 8 && h->sps.bit_depth_luma <= 14 && - h->sps.bit_depth_luma != 11 && h->sps.bit_depth_luma != 13 && - (h->sps.bit_depth_luma != 9 || !CHROMA422)) { + h->sps.bit_depth_luma != 11 && h->sps.bit_depth_luma != 13) { h->avctx->bits_per_raw_sample = h->sps.bit_depth_luma; h->cur_chroma_format_idc = h->sps.chroma_format_idc; h->pixel_shift = h->sps.bit_depth_luma > 8; |