wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
FFmpeg/libavutil
History
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
..
arm Merge branch 'release/0.7' into oldabi 2011-11-09 01:03:40 +01:00
avr32 Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
bfin Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
mips Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
ppc Merge remote branch 'qatar/master' 2011-05-13 04:40:40 +02:00
sh4 Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
tomi Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
x86 Merge remote-tracking branch 'khirnov/release/0.7' into release/0.8 2011-09-22 01:10:24 +02:00
adler32.c adler32: whitespace cosmetics 2011-06-30 16:50:27 +01:00
adler32.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
aes.c Merge remote-tracking branch 'qatar/master' 2011-07-05 02:26:17 +02:00
aes.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
attributes.h Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
audioconvert.c audioconvert: define unique strings for AV_CH_LAYOUT_5POINT{0,1}_BACK 2011-07-28 10:04:09 +02:00
audioconvert.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
avassert.h Merge remote-tracking branch 'qatar/master' 2011-05-22 04:53:19 +02:00
avstring.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
avstring.h Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
avutil.h Merge branch 'master' into oldabi 2011-08-05 13:02:20 +02:00
base64.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
base64.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
bswap.h bswap.h: Remove disabled code. 2011-04-29 20:01:04 +02:00
colorspace.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
common.h Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
cpu.c Merge remote-tracking branch 'qatar/master' 2011-07-01 05:35:26 +02:00
cpu.h cpudetect: add av_force_cpu_flags() 2011-06-02 21:03:54 +02:00
crc.c crc: fix signed overflow 2011-11-04 01:02:03 +01:00
crc.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
crc_data.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
des.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
des.h Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
dict.c Merge remote-tracking branch 'qatar/master' 2011-06-18 05:10:38 +02:00
dict.h Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 2011-07-26 00:14:04 +02:00
error.c Merge branch 'master' into oldabi 2011-06-16 06:29:01 +02:00
error.h Merge branch 'master' into oldabi 2011-04-25 03:49:47 +02:00
eval.c Merge remote-tracking branch 'khirnov/release/0.7' into release/0.8 2011-09-22 01:10:24 +02:00
eval.h lavu: remove FF_API_OLD_EVAL_NAMES cruft 2011-04-19 19:03:44 +02:00
fifo.c fifo: use av_freep() 2011-05-09 21:23:45 +02:00
fifo.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
file.c Merge branch 'master' into oldabi 2011-08-05 13:02:20 +02:00
file.h Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 2011-07-26 00:14:04 +02:00
imgutils.c Merge branch 'master' into oldabi 2011-08-05 13:02:20 +02:00
imgutils.h Merge branch 'master' into oldabi 2011-08-05 13:02:20 +02:00
integer.c avutil: Remove unused arbitrary precision integer code. 2011-06-28 13:14:46 +02:00
integer.h avutil: Remove unused arbitrary precision integer code. 2011-06-28 13:14:46 +02:00
internal.h Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
intfloat_readwrite.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
intfloat_readwrite.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
intmath.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
intreadwrite.h Merge remote-tracking branch 'qatar/master' 2011-06-18 05:10:38 +02:00
inverse.c Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
lfg.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
lfg.h Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 2011-07-26 00:14:04 +02:00
libavutil.v Add symbol versioning for shared libraries 2010-01-16 04:49:02 +00:00
libm.h Merge remote branch 'qatar/master' 2011-04-22 03:54:30 +02:00
lls.c Merge remote-tracking branch 'qatar/master' 2011-07-12 01:42:32 +02:00
lls.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
log.c Merge branch 'master' into oldabi 2011-05-15 19:18:02 +02:00
log.h Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
lzo.c Merge branch 'release/0.7' into oldabi 2011-11-09 01:03:40 +01:00
lzo.h Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 2011-07-26 00:14:04 +02:00
Makefile Merge branch 'master' into oldabi 2011-08-05 13:02:20 +02:00
mathematics.c Merge remote-tracking branch 'qatar/master' 2011-06-29 05:23:12 +02:00
mathematics.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
md5.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
md5.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
mem.c Merge branch 'release/0.8' into release/0.7 2011-11-04 20:20:37 +01:00
mem.h Merge branch 'release/0.7' into oldabi 2011-11-09 01:03:40 +01:00
opt.c Merge remote-tracking branch 'qatar/master' 2011-07-09 02:06:40 +02:00
opt.h Merge remote-tracking branch 'khirnov/release/0.7' into release/0.8 2011-09-22 01:10:24 +02:00
parseutils.c parseutils: add some documentation for small_strptime() 2011-07-23 17:01:28 +02:00
parseutils.h Merge remote-tracking branch 'qatar/master' 2011-07-14 20:44:58 +02:00
pca.c Remove unused, never built libavutil/pca.[ch] 2011-06-29 23:49:03 +01:00
pca.h Remove unused, never built libavutil/pca.[ch] 2011-06-29 23:49:03 +01:00
pixdesc.c Merge remote-tracking branch 'khirnov/release/0.7' into release/0.8 2011-09-22 01:10:24 +02:00
pixdesc.h pixdesc: remove duplicated header inclusion 2011-06-06 11:34:45 +02:00
pixfmt.h Merge remote-tracking branch 'qatar/master' 2011-06-30 04:32:24 +02:00
random_seed.c Merge branch 'master' into oldabi 2011-08-05 13:02:20 +02:00
random_seed.h avutil: elaborate documentation for av_get_random_seed 2011-06-30 21:19:16 +02:00
rational.c Merge remote-tracking branch 'qatar/master' 2011-06-30 04:32:24 +02:00
rational.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
rc4.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
rc4.h Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
samplefmt.c samplefmt: remove deprecated use of av_get_bits_per_sample_fmt() 2011-06-25 22:06:30 +02:00
samplefmt.h Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
sha.c Merge branch 'master' into oldabi 2011-08-05 13:02:20 +02:00
sha.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
sha1.h Revert removial of 3 files, this sliped through the last merge into oldabi because 2011-04-27 00:03:39 +02:00
softfloat.c Remove unused softfloat implementation. 2011-05-11 13:43:30 +02:00
softfloat.h Remove unused softfloat implementation. 2011-05-11 13:43:30 +02:00
timer.h Merge remote-tracking branch 'qatar/master' 2011-07-15 17:51:09 +02:00
tree.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
tree.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
utils.c Merge remote branch 'qatar/master' 2011-04-27 03:51:04 +02:00
x86_cpu.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00