Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Dec 2012 11:06:15 +0000 (12:06 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Dec 2012 11:06:15 +0000 (12:06 +0100)
* 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>
1  2 
cmdutils.c
cmdutils.h
ffmpeg_opt.c
libavcodec/h264_ps.c
libavformat/isom.c
libavformat/mov.c

diff --cc cmdutils.c
Simple merge
diff --cc cmdutils.h
Simple merge
diff --cc ffmpeg_opt.c
Simple merge
@@@ -365,15 -332,15 +365,16 @@@ int ff_h264_decode_seq_parameter_set(H2
      memset(sps->scaling_matrix4, 16, sizeof(sps->scaling_matrix4));
      memset(sps->scaling_matrix8, 16, sizeof(sps->scaling_matrix8));
      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 > 3) {
 -            av_log(h->s.avctx, AV_LOG_ERROR, "chroma_format_idc (%u) out of range\n", sps->chroma_format_idc);
 +        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);
              goto fail;
          } else if(sps->chroma_format_idc == 3) {
              sps->residual_color_transform_flag = get_bits1(&s->gb);
Simple merge
Simple merge