Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Mar 2013 12:07:25 +0000 (13:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Mar 2013 12:07:25 +0000 (13:07 +0100)
* qatar/master:
  avcodec: av_log_missing_feature(1) ---> avpriv_request_sample()

Conflicts:
libavcodec/aacsbr.c
libavcodec/amrnbdec.c
libavcodec/takdec.c
libavcodec/tta.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
17 files changed:
1  2 
libavcodec/aacdec.c
libavcodec/aacsbr.c
libavcodec/ac3dec.c
libavcodec/amrnbdec.c
libavcodec/amrwbdec.c
libavcodec/eac3dec.c
libavcodec/flashsv.c
libavcodec/h264.c
libavcodec/mimic.c
libavcodec/mpc8.c
libavcodec/rv10.c
libavcodec/smc.c
libavcodec/truemotion2.c
libavcodec/vp8.c
libavcodec/wmalosslessdec.c
libavcodec/wmaprodec.c
libavcodec/wmavoice.c

@@@ -2815,12 -2679,11 +2814,11 @@@ static int read_stream_mux_config(struc
              return AVERROR_PATCHWELCOME;
          }
  
 -        // for each program (which there is only on in DVB)
 +        // for each program (which there is only one in DVB)
  
 -        // for each layer (which there is only on in DVB)
 +        // for each layer (which there is only one in DVB)
          if (get_bits(gb, 3)) {                   // numLayer
-             av_log_missing_feature(latmctx->aac_ctx.avctx,
-                                    "Multiple layers", 1);
+             avpriv_request_sample(latmctx->aac_ctx.avctx, "Multiple layers");
              return AVERROR_PATCHWELCOME;
          }
  
@@@ -940,9 -927,7 +940,9 @@@ static void read_sbr_extension(AACConte
          }
          break;
      default:
 -        avpriv_request_sample(ac->avctx, "Reserved SBR extensions");
 +        // some files contain 0-padding
 +        if (bs_extension_id || *num_bits_left > 16 || show_bits(gb, *num_bits_left))
-             av_log_missing_feature(ac->avctx, "Reserved SBR extensions", 1);
++            avpriv_request_sample(ac->avctx, "Reserved SBR extensions");
          skip_bits_long(gb, *num_bits_left); // bs_fill_bits
          *num_bits_left = 0;
          break;
Simple merge
@@@ -973,8 -957,7 +973,8 @@@ static int amrnb_decode_frame(AVCodecCo
          return AVERROR_INVALIDDATA;
      }
      if (p->cur_frame_mode == MODE_DTX) {
-         av_log_missing_feature(avctx, "dtx mode", 0);
 -        avpriv_request_sample(avctx, "dtx mode");
++        avpriv_report_missing_feature(avctx, "dtx mode");
 +        av_log(avctx, AV_LOG_INFO, "Note: libopencore_amrnb supports dtx\n");
          return AVERROR_PATCHWELCOME;
      }
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -128,13 -128,9 +128,13 @@@ static av_cold int mpc8_decode_init(AVC
  
      skip_bits(&gb, 3);//sample rate
      c->maxbands = get_bits(&gb, 5) + 1;
 +    if (c->maxbands >= BANDS) {
 +        av_log(avctx,AV_LOG_ERROR, "maxbands %d too high\n", c->maxbands);
 +        return AVERROR_INVALIDDATA;
 +    }
      channels = get_bits(&gb, 4) + 1;
      if (channels > 2) {
-         av_log_missing_feature(avctx, "Multichannel MPC SV8", 1);
+         avpriv_request_sample(avctx, "Multichannel MPC SV8");
          return AVERROR_PATCHWELCOME;
      }
      c->MSS = get_bits1(&gb);
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge