wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
FFmpeg/tests/ref
History
Exact
Michael Niedermayer 57bf0d1fe5 Merge branch 'release/0.7' into oldabi 
* release/0.7: (290 commits)
  nuv: Fix combination of size changes and LZO compression.
  av_lzo1x_decode: properly handle negative buffer length.
  Do not call parse_keyframes_index with NULL stream.
  update versions for 0.7 branch
  Version numbers for 0.8.6
  snow: emu edge support Fixes Ticket592
  imc: validate channel count
  imc: check for ff_fft_init() failure (cherry picked from commit 95fee70d67)
  libgsmdec: check output buffer size before decoding (cherry picked from commit b03761b130)
  configure: fix arch x86_32
  mp3enc: avoid truncating id3v1 tags by one byte
  asfdec: Check packet_replic_size earlier
  cin audio: validate the channel count
  binkaudio: add some buffer overread checks.
  atrac1: validate number of channels (cherry picked from commit bff5b2c1ca)
  atrac1: check output buffer size before decoding (cherry picked from commit 33684b9c12)
  vp3: fix oob read for negative tokens and memleaks on error. (cherry picked from commit 8370e426e4)
  apedec: set s->currentframeblocks after validating nblocks
  apedec: use unsigned int for 'nblocks' and make sure that it's within int range
  apedec: check for data buffer realloc failure (cherry picked from commit 11ca8b2d74)
  ...

Conflicts:
	Changelog
	Makefile
	RELEASE
	configure
	libavcodec/error_resilience.c
	libavcodec/mpegvideo.c
	libavformat/matroskaenc.c
	tests/ref/lavf/mxf

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-09 01:03:40 +01:00
..
acodec Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 2011-10-01 22:42:41 +02:00
fate Merge branch 'release/0.7' into oldabi 2011-11-09 01:03:40 +01:00
lavf Merge branch 'release/0.7' into oldabi 2011-11-09 01:03:40 +01:00
lavfi Revert "swscale: use 15-bit intermediates for 9/10-bit scaling." 2011-08-02 12:27:43 -07:00
seek Merge remote-tracking branch 'qatar/master' 2011-07-09 02:06:40 +02:00
vsynth1 Merge remote-tracking branch 'qatar/master' 2011-07-22 12:08:52 +02:00
vsynth2 Merge remote-tracking branch 'qatar/master' 2011-07-22 12:08:52 +02:00