Merge commit '0a7005bebd23ade7bb852bce0401af1a8fdbb723'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 13 Oct 2012 13:42:49 +0000 (15:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 13 Oct 2012 13:42:49 +0000 (15:42 +0200)
* commit '0a7005bebd23ade7bb852bce0401af1a8fdbb723':
  rtpdec_xiph: fix function return type
  smjpeg: fix type of 'ret' variable in smjpeg_read_packet()
  mpegvideo: remove write-only variable
  Use proper return values in case of missing features
  fate: add avstring test
  rangecoder-test: Set error message log level to error, instead of debug

Conflicts:
libavcodec/aacdec.c
libavcodec/amrnbdec.c
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
18 files changed:
1  2 
libavcodec/aac_adtstoasc_bsf.c
libavcodec/aacdec.c
libavcodec/ac3dec.c
libavcodec/alsdec.c
libavcodec/amrnbdec.c
libavcodec/amrwbdec.c
libavcodec/eac3dec.c
libavcodec/flacdec.c
libavcodec/mpc8.c
libavcodec/mpegvideo.c
libavcodec/rangecoder.c
libavcodec/tta.c
libavcodec/wmaprodec.c
libavcodec/wmavoice.c
libavformat/rtpdec_qt.c
libavformat/rtpdec_xiph.c
libavformat/smjpegdec.c
tests/fate/libavutil.mak

Simple merge
Simple merge
Simple merge
Simple merge
@@@ -967,9 -950,8 +967,9 @@@ static int amrnb_decode_frame(AVCodecCo
          return AVERROR_INVALIDDATA;
      }
      if (p->cur_frame_mode == MODE_DTX) {
 -        av_log_missing_feature(avctx, "dtx mode", 1);
 +        av_log_missing_feature(avctx, "dtx mode", 0);
 +        av_log(avctx, AV_LOG_INFO, "Note: libopencore_amrnb supports dtx\n");
-         return -1;
+         return AVERROR_PATCHWELCOME;
      }
  
      if (p->cur_frame_mode == MODE_12k2) {
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -877,7 -912,8 +877,7 @@@ av_cold int ff_MPV_common_init(MpegEncC
          avcodec_get_frame_defaults(&s->picture[i].f);
      }
  
-         if ((err = init_context_frame(s)))
 -    if (s->width && s->height) {
+         if (init_context_frame(s))
              goto fail;
  
          s->parse_context.state = -1;
Simple merge
@@@ -200,11 -222,9 +200,11 @@@ static av_cold int tta_decode_init(AVCo
          }
          if (s->format == FORMAT_ENCRYPTED) {
              av_log_missing_feature(s->avctx, "Encrypted TTA", 0);
-             return AVERROR(EINVAL);
+             return AVERROR_PATCHWELCOME;
          }
          avctx->channels = s->channels = get_bits(&s->gb, 16);
 +        if (s->channels > 1 && s->channels < 9)
 +            avctx->channel_layout = tta_channel_layouts[s->channels-2];
          avctx->bits_per_coded_sample = get_bits(&s->gb, 16);
          s->bps = (avctx->bits_per_coded_sample + 7) / 8;
          avctx->sample_rate = get_bits_long(&s->gb, 32);
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge