diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-20 12:06:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-20 12:06:15 +0100 |
| commit | 40ea3438661e6cc30b60bc019ae01fb073eabb35 (patch) | |
| tree | 618cba03caedda423e3c34f9bd463afcd94f0800 /libavcodec | |
| parent | 174c483e2e751c71ca9ae4e9ca33082bbb1eea56 (diff) | |
| parent | c661cb6672af5ebcb900ec8766b24761bd2ab011 (diff) | |
Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011'
* commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011':
cmdutils: pass number of groups to split_commandline().
mov: handle h263 and flv1 for codec_tag 'H','2','6','3'
h264: fix sps parsing for SVC and CAVLC 4:4:4 Intra profiles
Conflicts:
libavcodec/h264_ps.c
libavformat/isom.c
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264_ps.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index 4b81c9877d..a68645bc36 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -367,10 +367,11 @@ 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 || 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 > 3U) { av_log(h->s.avctx, AV_LOG_ERROR, "chroma_format_idc %d is illegal\n", sps->chroma_format_idc); |