diff options
| author | Victor Lopez <gallandae@gmail.com> | 2012-12-19 09:12:24 +0100 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2013-01-12 19:34:10 +0100 |
| commit | 884a9b0d298acfba29c01690e27419ab646fa51a (patch) | |
| tree | 81c6b1959e3108935ece7b5e7847f0f860a79e19 | |
| parent | 4457e6137d83d3b65d919608cd0f12bc62d57c67 (diff) | |
| download | ffmpeg-884a9b0d298acfba29c01690e27419ab646fa51a.tar.gz | |
h264: fix sps parsing for SVC and CAVLC 4:4:4 Intra profiles
Fixes bug 396.
CC: libav-stable@libav.org
(cherry picked from commit 1c8bf3bfed5ff5c504c8e3de96188a977f67cce0)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| -rw-r--r-- | libavcodec/h264_ps.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index 367138a8c0..26db079af3 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -330,7 +330,11 @@ int ff_h264_decode_seq_parameter_set(H264Context *h){ memset(sps->scaling_matrix8, 16, sizeof(sps->scaling_matrix8)); sps->scaling_matrix_present = 0; - if(sps->profile_idc >= 100){ //high profile + 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) { sps->chroma_format_idc= get_ue_golomb_31(&s->gb); if(sps->chroma_format_idc > 3) { av_log(h->s.avctx, AV_LOG_ERROR, "chroma_format_idc (%u) out of range\n", sps->chroma_format_idc); |