[FFmpeg-cvslog] Merge commit '9b79a05289d91d1184455d12e6c4df457f0657c4' into release/0.10

Michael Niedermayer git at videolan.org
Sun Apr 7 14:58:55 CEST 2013


ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Sun Apr  7 14:47:49 2013 +0200| [a7908ac012ef60661765bda4550c02255d8265fd] | committer: Michael Niedermayer

Merge commit '9b79a05289d91d1184455d12e6c4df457f0657c4' into release/0.10

* 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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a7908ac012ef60661765bda4550c02255d8265fd
---





More information about the ffmpeg-cvslog mailing list