Merge commit '8b8899ac3233b4f7af83ded0dc032fad8902d714'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 23 Oct 2012 13:00:27 +0000 (15:00 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 23 Oct 2012 13:00:27 +0000 (15:00 +0200)
* commit '8b8899ac3233b4f7af83ded0dc032fad8902d714':
  fate: Declare avcodec/avformat deps in the respective Makefile snippets
  fate: Add dependencies for WMA and WavPack tests
  Improve wording and spelling of av_log_missing_feature messages.
  lavu: remove disabled FF_API_AV_FIFO_PEEK cruft

Conflicts:
libavcodec/aacsbr.c
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 files changed:
1  2 
libavcodec/aacdec.c
libavcodec/aacsbr.c
libavcodec/eac3dec.c
libavcodec/flacdec.c
libavcodec/flashsv.c
libavcodec/proresdec_lgpl.c
libavcodec/wmalosslessdec.c
libavformat/oggparseskeleton.c
libavformat/spdifdec.c
libavutil/fifo.h
libavutil/version.h
tests/Makefile

@@@ -2793,12 -2667,12 +2793,12 @@@ 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);
+                                    "Multiple layers", 1);
              return AVERROR_PATCHWELCOME;
          }
  
@@@ -933,9 -929,7 +933,9 @@@ static void read_sbr_extension(AACConte
          }
          break;
      default:
 -        av_log_missing_feature(ac->avctx, "Reserved SBR extensions", 1);
 +        // 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 are", 1);
++            av_log_missing_feature(ac->avctx, "Reserved SBR extensions", 1);
          skip_bits_long(gb, *num_bits_left); // bs_fill_bits
          *num_bits_left = 0;
          break;
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
   * @{
   */
  
- #ifndef FF_API_AV_FIFO_PEEK
- #define FF_API_AV_FIFO_PEEK             (LIBAVUTIL_VERSION_MAJOR < 52)
- #endif
 +#ifndef FF_API_OLD_EVAL_NAMES
 +#define FF_API_OLD_EVAL_NAMES           (LIBAVUTIL_VERSION_MAJOR < 52)
 +#endif
 +#ifndef FF_API_GET_BITS_PER_SAMPLE_FMT
 +#define FF_API_GET_BITS_PER_SAMPLE_FMT (LIBAVUTIL_VERSION_MAJOR < 53)
 +#endif
 +#ifndef FF_API_FIND_OPT
 +#define FF_API_FIND_OPT                 (LIBAVUTIL_VERSION_MAJOR < 53)
 +#endif
 +#ifndef FF_API_OLD_AVOPTIONS
 +#define FF_API_OLD_AVOPTIONS            (LIBAVUTIL_VERSION_MAJOR < 53)
 +#endif
 +#ifndef FF_API_OLD_TC_ADJUST_FRAMENUM
 +#define FF_API_OLD_TC_ADJUST_FRAMENUM   (LIBAVUTIL_VERSION_MAJOR < 52)
 +#endif
  #ifndef FF_API_PIX_FMT
  #define FF_API_PIX_FMT                  (LIBAVUTIL_VERSION_MAJOR < 53)
  #endif
diff --cc tests/Makefile
@@@ -114,16 -89,12 +114,13 @@@ include $(SRC_PATH)/tests/fate/vqf.ma
  include $(SRC_PATH)/tests/fate/wavpack.mak
  include $(SRC_PATH)/tests/fate/wma.mak
  
 -FATE_AVCONV += $(FATE_AVCONV-yes)
 -FATE-$(CONFIG_AVCONV) += $(FATE_AVCONV)
 +FATE_FFMPEG += $(FATE_FFMPEG-yes) $(FATE_AVCONV) $(FATE_AVCONV-yes)
 +FATE-$(CONFIG_FFMPEG) += $(FATE_FFMPEG)
 +FATE-$(CONFIG_FFPROBE) += $(FATE_FFPROBE)
  
- FATE-$(CONFIG_AVCODEC)  += $(FATE_LIBAVCODEC)
- FATE-$(CONFIG_AVFORMAT) += $(FATE_LIBAVFORMAT)
  FATE_SAMPLES_AVCONV           += $(FATE_SAMPLES_AVCONV-yes)
 -FATE_SAMPLES-$(CONFIG_AVCONV) += $(FATE_SAMPLES_AVCONV)
 -FATE_SAMPLES += $(FATE_SAMPLES-yes)
 +FATE_EXTERN-$(CONFIG_FFMPEG)  += $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG) $(FATE_SAMPLES_FFPROBE)
 +FATE_EXTERN += $(FATE_EXTERN-yes)
  
  FATE += $(FATE-yes)
  FATE += $(FATE_LIBAVUTIL)