Merge commit '9b79a05289d91d1184455d12e6c4df457f0657c4' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 7 Apr 2013 12:47:49 +0000 (14:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 7 Apr 2013 12:47:49 +0000 (14:47 +0200)
* commit '9b79a05289d91d1184455d12e6c4df457f0657c4':
  wmaprodec: return an error, not 0, when the input is too small.
  vmdaudio: fix invalid reads when packet size is not a multiple of chunk size
  vorbisdec: Error on bark_map_size equal to 0.
  configure: clean up Altivec detection
  Update RELEASE file for 0.8.6
  update year to 2013
  oggdec: make sure the private parse data is cleaned up (cherry picked from commit d894f74762bc95310ba23f804b7ba8dffc8f6646)
  build: Fix CAF demuxer dependencies
  doc: developer: Allow tabs in the vim configuration for Automake files
  doc: filters: Correct BNF FILTER description

Conflicts:
RELEASE
cmdutils.c
libavcodec/vmdav.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
cmdutils.c
configure
doc/developer.texi
doc/filters.texi
libavcodec/Makefile
libavcodec/vorbisdec.c
libavcodec/wmaprodec.c
libavformat/oggdec.c
libavformat/oggdec.h

diff --cc cmdutils.c
@@@ -56,9 -55,7 +56,9 @@@
  struct SwsContext *sws_opts;
  AVDictionary *format_opts, *codec_opts;
  
- const int this_year = 2012;
 -static const int this_year = 2013;
++const int this_year = 2013;
 +
 +static FILE *report_file;
  
  void init_opts(void)
  {
diff --cc configure
Simple merge
Simple merge
Simple merge
@@@ -578,11 -533,12 +578,12 @@@ OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER
  # libavformat dependencies
  OBJS-$(CONFIG_ADTS_MUXER)              += mpeg4audio.o
  OBJS-$(CONFIG_ADX_DEMUXER)             += adx.o
- OBJS-$(CONFIG_CAF_DEMUXER)             += mpeg4audio.o mpegaudiodata.o
+ OBJS-$(CONFIG_CAF_DEMUXER)             += mpeg4audio.o mpegaudiodata.o  \
+                                           ac3tab.o
  OBJS-$(CONFIG_DV_DEMUXER)              += dvdata.o
 -OBJS-$(CONFIG_DV_MUXER)                += dvdata.o
 -OBJS-$(CONFIG_FLAC_DEMUXER)            += flacdec.o flacdata.o flac.o
 -OBJS-$(CONFIG_FLAC_MUXER)              += flacdec.o flacdata.o flac.o
 +OBJS-$(CONFIG_DV_MUXER)                += dvdata.o timecode.o
 +OBJS-$(CONFIG_FLAC_DEMUXER)            += flacdec.o flacdata.o flac.o vorbis_data.o
 +OBJS-$(CONFIG_FLAC_MUXER)              += flacdec.o flacdata.o flac.o vorbis_data.o
  OBJS-$(CONFIG_FLV_DEMUXER)             += mpeg4audio.o
  OBJS-$(CONFIG_GXF_DEMUXER)             += mpeg12data.o
  OBJS-$(CONFIG_IFF_DEMUXER)             += iff.o
Simple merge
Simple merge
Simple merge
Simple merge