summaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-07-03 00:40:26 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-07-03 00:40:26 +0200
commit4330b8bba24aab456bd302c50d71aacad196d48c (patch)
tree7c848a49c7ea006773c1af56cfb37ba4053036b7 /libavcodec
parent9091ba9dfa0901bdce8305cf282c747b0f4c942e (diff)
downloadffmpeg-streaming-4330b8bba24aab456bd302c50d71aacad196d48c.zip
ffmpeg-streaming-4330b8bba24aab456bd302c50d71aacad196d48c.tar.gz
h264: sps: handle more profiles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/h264_ps.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c
index 2408349..41acff2 100644
--- a/libavcodec/h264_ps.c
+++ b/libavcodec/h264_ps.c
@@ -349,7 +349,10 @@ 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){ //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->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);
OpenPOWER on IntegriCloud