diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 04:30:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 04:30:57 +0100 |
| commit | 3ec3f70ddb1b97fd6174ab3ca8617d8a1a6516ab (patch) | |
| tree | c084703a72400ec6b9f39a1f26dbdd45069c29f9 /libavcodec | |
| parent | e4a6310cce5c1663f68253c50f364fc0c055f05a (diff) | |
| parent | e70ab7c1f5005041bba0e4efc1165410f83495b2 (diff) | |
| download | ffmpeg-n2.3-dev.tar.gz | |
Merge commit 'e70ab7c1f5005041bba0e4efc1165410f83495b2'n2.3-dev
* commit 'e70ab7c1f5005041bba0e4efc1165410f83495b2':
h264: add MVCD to the list of High profiles in SPS
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264_ps.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index 603f1681e3..63b4d83c18 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -359,11 +359,17 @@ int ff_h264_decode_seq_parameter_set(H264Context *h) sps->scaling_matrix_present = 0; sps->colorspace = 2; //AVCOL_SPC_UNSPECIFIED - if (sps->profile_idc == 100 || sps->profile_idc == 110 || - sps->profile_idc == 122 || sps->profile_idc == 244 || - sps->profile_idc == 44 || sps->profile_idc == 83 || - sps->profile_idc == 86 || sps->profile_idc == 118 || - sps->profile_idc == 128 || sps->profile_idc == 144) { + if (sps->profile_idc == 100 || // High profile + sps->profile_idc == 110 || // High10 profile + sps->profile_idc == 122 || // High422 profile + sps->profile_idc == 244 || // High444 Predictive profile + sps->profile_idc == 44 || // Cavlc444 profile + sps->profile_idc == 83 || // Scalable Constrained High profile (SVC) + sps->profile_idc == 86 || // Scalable High Intra profile (SVC) + sps->profile_idc == 118 || // Stereo High profile (MVC) + sps->profile_idc == 128 || // Multiview High profile (MVC) + sps->profile_idc == 138 || // Multiview Depth High profile (MVCD) + sps->profile_idc == 144) { // old High444 profile sps->chroma_format_idc = get_ue_golomb_31(&h->gb); if (sps->chroma_format_idc > 3U) { avpriv_request_sample(h->avctx, "chroma_format_idc %u", |