ffmpeg/libavutil
Michael Niedermayer 3edff185ab Merge remote-tracking branch 'qatar/master'
* qatar/master: (21 commits)
  ipmovie: do not read audio packets before the codec is known
  truemotion2: check size before GetBitContext initialisation
  avio: Only do implicit network initialization for network protocols
  avio: Add an URLProtocol flag for indicating that a protocol uses network
  adpcm: ADPCM Electronic Arts has always two channels
  matroskadec: Fix a bug where a pointer was cached to an array that might later move due to a realloc()
  fate: Add missing reference file from 9b4767e4.
  mov: Support MOV_CH_LAYOUT_USE_DESCRIPTIONS for labeled descriptions.
  4xm: Prevent buffer overreads.
  mjpegdec: parse RSTn to prevent skipping other data in mjpeg_decode_scan
  vp3: add fate test for non-zero last coefficient
  vp3: fix streams with non-zero last coefficient
  swscale: remove unused U/V arguments from yuv2rgb_write().
  timer: K&R formatting cosmetics
  lavf: cosmetics, reformat av_read_frame().
  lavf: refactor av_read_frame() to make it easier to understand.
  Report an error if pitch_lag is zero in AMR-NB decoder.
  Revert "4xm: Prevent buffer overreads."
  4xm: Prevent buffer overreads.
  4xm: pass the correct remaining buffer size to decode_i2_frame().
  ...

Conflicts:
	libavcodec/4xm.c
	libavcodec/mjpegdec.c
	libavcodec/truemotion2.c
	libavformat/ipmovie.c
	libavformat/mov_chan.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-06 02:45:12 +01:00
..
arm
avr32
bfin
mips
ppc
sh4
tomi
x86
Makefile
adler32.c
adler32.h
aes.c
aes.h
attributes.h
audioconvert.c
audioconvert.h
avassert.h
avstring.c
avstring.h
avutil.h Merge remote-tracking branch 'qatar/master' 2012-01-04 01:12:34 +01:00
base64.c
base64.h
bswap.h
colorspace.h
common.h Merge remote-tracking branch 'qatar/master' 2012-01-04 01:12:34 +01:00
cpu.c
cpu.h
crc.c
crc.h
crc_data.h
des.c
des.h
dict.c
dict.h
error.c
error.h
eval.c
eval.h
fifo.c fifo: Make writes atomic. 2011-12-23 00:18:36 +01:00
fifo.h
file.c
file.h
imgutils.c Make systematic palette opaque. 2011-12-23 11:43:29 +01:00
imgutils.h
integer.c
integer.h
internal.h
intfloat.h
intfloat_readwrite.c
intfloat_readwrite.h
intmath.h
intreadwrite.h
inverse.c
lfg.c
lfg.h
libavutil.v
libm.h
lls.c
lls.h
log.c
log.h
lzo.c Avoid av_memcpy_backptr hang without extra branch. 2011-12-30 10:37:33 +01:00
lzo.h Avoid uninitialized data in lcldec when ofs is 0 in MSZH. 2011-12-31 16:31:15 +01:00
mathematics.c
mathematics.h
md5.c
md5.h
mem.c mem: add av_max_alloc() to limit the maximum amount that may be allocated in one piece 2011-12-25 18:55:43 +01:00
mem.h mem: add av_max_alloc() to limit the maximum amount that may be allocated in one piece 2011-12-25 18:55:43 +01:00
opt.c
opt.h
parseutils.c
parseutils.h
pca.c
pca.h
pixdesc.c
pixdesc.h
pixfmt.h
random_seed.c
random_seed.h
rational.c
rational.h
rc4.c
rc4.h
samplefmt.c
samplefmt.h
sha.c
sha.h
softfloat.c
softfloat.h
timer.h Merge remote-tracking branch 'qatar/master' 2012-01-06 02:45:12 +01:00
tree.c
tree.h
utils.c libavutil: increase LIBAVUTIL_VERSION_MICRO to 100 2011-12-22 03:01:17 +01:00
x86_cpu.h