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	Merge remote-tracking branch 'qatar/master'	2011-12-13 00:39:48 +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 'qatar/master'	2011-12-13 00:39:48 +01:00
adler32.c	Merge remote-tracking branch 'qatar/master'	2011-12-09 00:05:51 +01:00
adler32.h	Merge remote-tracking branch 'qatar/master'	2011-11-23 04:02:17 +01:00
aes.c	Merge remote-tracking branch 'qatar/master'	2011-12-22 01:51:53 +01:00
aes.h	Merge remote-tracking branch 'qatar/master'	2011-11-23 04:02:17 +01:00
attributes.h	avutil: add av_noreturn	2011-11-11 04:24:00 +01:00
audioconvert.c	Merge remote-tracking branch 'qatar/master'	2011-11-26 01:12:08 +01:00
audioconvert.h	Merge remote-tracking branch 'qatar/master'	2011-12-10 02:01:03 +01:00
avassert.h	Merge remote-tracking branch 'qatar/master'	2011-05-22 04:53:19 +02:00
avstring.c	Merge remote-tracking branch 'qatar/master'	2011-11-07 03:01:43 +01:00
avstring.h	Merge remote-tracking branch 'qatar/master'	2011-12-13 00:39:48 +01:00
avutil.h	Merge remote-tracking branch 'qatar/master'	2012-01-04 01:12:34 +01:00
base64.c	Add coverage exclusions for test code.	2011-12-05 20:05:44 +01:00
base64.h	Merge remote-tracking branch 'qatar/master'	2011-11-23 04:02:17 +01:00
bswap.h	Merge remote-tracking branch 'qatar/master'	2011-12-13 00:39:48 +01: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'	2012-01-04 01:12:34 +01:00
cpu.c	Merge remote-tracking branch 'qatar/master'	2011-09-27 02:14:37 +02:00
cpu.h	Merge remote-tracking branch 'qatar/master'	2011-09-27 02:14:37 +02:00
crc_data.h	Replace FFmpeg with Libav in licence headers	2011-03-19 13:33:20 +00:00
crc.c	Merge remote-tracking branch 'qatar/master'	2011-12-05 00:11:57 +01:00
crc.h	Replace FFmpeg with Libav in licence headers	2011-03-19 13:33:20 +00:00
des.c	Add coverage exclusions for test code.	2011-12-05 20:05:44 +01:00
des.h	Merge remote-tracking branch 'qatar/master'	2011-09-21 21:25:43 +02:00
dict.c	Merge remote-tracking branch 'qatar/master'	2011-11-07 03:01:43 +01:00
dict.h	Merge remote-tracking branch 'qatar/master'	2011-11-23 04:02:17 +01:00
error.c	Merge remote-tracking branch 'qatar/master'	2011-12-20 04:12:09 +01:00
error.h	Merge remote-tracking branch 'qatar/master'	2011-12-20 04:12:09 +01:00
eval.c	Add coverage exclusions for test code.	2011-12-05 20:05:44 +01:00
eval.h	Merge remote-tracking branch 'qatar/master'	2011-12-12 01:25:37 +01:00
fifo.c	fifo: Make writes atomic.	2011-12-23 00:18:36 +01:00
fifo.h	fifo: add note in av_fifo_realloc2() doxy regarding reallocation failure behavior	2011-08-30 10:03:13 +02:00
file.c	av_tempfile: dont try the current directory with mkstemp() unless we are on windows	2011-10-16 22:32:41 +02:00
file.h	av_tempfile: Pass int log_offset, void *log_ctx	2011-10-16 21:51:28 +02:00
imgutils.c	Make systematic palette opaque.	2011-12-23 11:43:29 +01:00
imgutils.h	Merge remote-tracking branch 'qatar/master'	2011-11-23 04:02:17 +01: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-12-13 00:39:48 +01:00
intfloat_readwrite.c	Merge remote-tracking branch 'qatar/master'	2011-10-12 05:40:57 +02:00
intfloat_readwrite.h	Merge remote-tracking branch 'qatar/master'	2011-12-12 01:25:37 +01:00
intfloat.h	lavu: replace int/float punning functions	2011-12-11 18:47:19 +00:00
intmath.h	Merge remote-tracking branch 'qatar/master'	2011-11-23 04:02:17 +01: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	Merge remote-tracking branch 'qatar/master'	2011-12-05 00:11:57 +01:00
lfg.h	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
libavutil.v
libm.h	Check for cbrtf() and provide fallback	2011-10-22 19:49:27 +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	lavu: introduce av_log_format_line.	2011-12-08 18:47:47 +01:00
log.h	lavu: introduce av_log_format_line.	2011-12-08 18:47:47 +01:00
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
Makefile	Merge remote-tracking branch 'qatar/master'	2011-12-13 23:21:37 +01:00
mathematics.c	Merge remote-tracking branch 'qatar/master'	2011-06-29 05:23:12 +02:00
mathematics.h	Merge remote-tracking branch 'qatar/master'	2011-11-23 04:02:17 +01:00
md5.c	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
md5.h	Merge remote-tracking branch 'qatar/master'	2011-11-23 04:02:17 +01:00
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	av_opt: add av_opt_ptr() to return a pointer to a field of a object based on	2011-12-05 03:22:04 +01:00
opt.h	Fix compilation for C++ applications	2011-12-05 21:13:45 +01:00
parseutils.c	Merge remote-tracking branch 'qatar/master'	2011-11-17 02:44:33 +01:00
parseutils.h	Merge remote-tracking branch 'qatar/master'	2011-12-13 00:39:48 +01: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 'qatar/master'	2011-12-05 00:11:57 +01:00
pixdesc.h	Merge remote-tracking branch 'qatar/master'	2011-11-25 04:34:44 +01:00
pixfmt.h	pixfmt: Add 32bit rgb without alpha formats	2011-11-28 02:44:05 +01:00
random_seed.c	Merge remote-tracking branch 'qatar/master'	2011-12-05 00:11:57 +01:00
random_seed.h	Merge remote-tracking branch 'qatar/master'	2011-11-23 04:02:17 +01:00
rational.c	Merge remote-tracking branch 'qatar/master'	2011-12-05 00:11:57 +01:00
rational.h	Merge remote-tracking branch 'qatar/master'	2011-11-23 04:02:17 +01: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	libavutil: increase struct SampleFmtInfo member 'name' length to 8	2011-12-03 00:35:20 +01:00
samplefmt.h	lavu: add av_get_alt_sample_fmt().	2011-11-24 16:55:45 +01:00
sha.c	Merge remote-tracking branch 'qatar/master'	2011-07-05 02:26:17 +02:00
sha.h	Merge remote-tracking branch 'qatar/master'	2011-11-23 04:02:17 +01: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'	2012-01-06 02:45:12 +01:00
tree.c	Merge remote-tracking branch 'qatar/master'	2011-12-05 00:11:57 +01:00
tree.h	Merge remote-tracking branch 'qatar/master'	2011-11-23 04:02:17 +01:00
utils.c	libavutil: increase LIBAVUTIL_VERSION_MICRO to 100	2011-12-22 03:01:17 +01:00
x86_cpu.h	Replace FFmpeg with Libav in licence headers	2011-03-19 13:33:20 +00:00