Michael Niedermayer 2e0c360abd Merge remote-tracking branch 'qatar/master' ... * qatar/master: cosmetics: Align muxer/demuxer declarations mpeg12: Do not change frame_pred_frame_dct flag and demote error into a warning avcodec: remove avcodec_guess_channel_layout() avutil: Add av_get_default_channel_layout() Conflicts: doc/APIchanges libavcodec/mpeg12.c libavformat/cdg.c libavformat/matroskaenc.c libavformat/mpegts.c libavformat/nuv.c libavformat/wav.c libavutil/audioconvert.c libavutil/audioconvert.h libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-04-06 22:52:01 +02:00
..
arm	Merge remote-tracking branch 'qatar/master'	2012-03-13 01:56:33 +01:00
avr32
bfin
mips
ppc
sh4
tomi
x86	Merge remote-tracking branch 'qatar/master'	2012-03-16 01:36:49 +01:00
adler32.c	adler32: add comment for the SIMD code	2012-02-04 20:27:02 +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	avutil: Add av_get_default_channel_layout()	2012-04-05 16:35:14 -04:00
audioconvert.h	avutil: Add av_get_default_channel_layout()	2012-04-05 16:35:14 -04:00
avassert.h
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-04-06 22:52:01 +02:00
base64.c	base64: 10l endian fix.	2012-01-22 23:06:04 +01:00
base64.h	Merge remote-tracking branch 'qatar/master'	2011-11-23 04:02:17 +01:00
bprint.c	lavu: add av_bprintf and related.	2012-03-21 13:39:28 +01:00
bprint.h	lavu: add av_bprintf and related.	2012-03-21 13:39:28 +01:00
bswap.h	Merge remote-tracking branch 'qatar/master'	2011-12-13 00:39:48 +01:00
colorspace.h
common.h	lavu: document av_reverse.	2012-02-22 15:35:44 +01:00
cpu.c	Merge remote-tracking branch 'qatar/master'	2012-03-13 01:56:33 +01:00
cpu.h	Merge remote-tracking branch 'qatar/master'	2012-03-13 01:56:33 +01:00
crc_data.h
crc.c	Merge remote-tracking branch 'qatar/master'	2011-12-05 00:11:57 +01:00
crc.h	Merge remote-tracking branch 'qatar/master'	2012-01-29 00:34:59 +01:00
des.c	des: Fix half a dozen warnings	2012-04-02 21:23:56 +02: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'	2012-03-20 00:03:19 +01:00
error.c	Merge remote-tracking branch 'qatar/master'	2012-02-26 05:11:21 +01:00
error.h	Merge remote-tracking branch 'qatar/master'	2012-02-26 05:11:21 +01:00
eval.c	The lt and lte functions were swapped.	2012-04-01 11:01:08 +02: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
file.c	Merge remote-tracking branch 'qatar/master'	2012-01-28 07:53:34 +01:00
file.h	av_tempfile: Pass int log_offset, void *log_ctx	2011-10-16 21:51:28 +02:00
imgutils.c	Merge remote-tracking branch 'qatar/master'	2012-03-29 04:11:10 +02:00
imgutils.h	Merge remote-tracking branch 'qatar/master'	2011-11-23 04:02:17 +01:00
integer.c
integer.h
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'	2012-01-29 00:34:59 +01: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
inverse.c
lfg.c	Merge remote-tracking branch 'qatar/master'	2012-04-04 21:17:52 +02:00
lfg.h
libavutil.v
libm.h	Check for cbrtf() and provide fallback	2011-10-22 19:49:27 +02:00
lls.c
lls.h
log.c	log: use a different color for debug (green).	2012-01-09 22:35:45 +01:00
log.h	lavu: introduce av_parse_ratio() and use it in ffmpeg and lavfi/aspect	2012-02-06 11:30:54 +01:00
lzo.c	libavutil: Remove broken and pointless lzo test program.	2012-03-26 13:00:09 +02: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'	2012-03-26 20:52:52 +02:00
mathematics.c	Merge remote-tracking branch 'qatar/master'	2012-02-21 05:10:12 +01:00
mathematics.h	Merge remote-tracking branch 'qatar/master'	2012-02-21 05:10:12 +01:00
md5.c
md5.h	Merge remote-tracking branch 'qatar/master'	2012-01-29 00:34:59 +01:00
mem.c	Merge remote-tracking branch 'qatar/master'	2012-01-29 00:34:59 +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: Fix "libavutil/opt.c:811:20: warning: initialization discards ‘const’ qualifier from pointer target type [enabled by default]"	2012-01-20 20:34:48 +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'	2012-03-29 04:11:10 +02:00
parseutils.h	lavu: introduce av_parse_ratio() and use it in ffmpeg and lavfi/aspect	2012-02-06 11:30:54 +01:00
pca.c
pca.h
pixdesc.c	pixdesc: put components always in the same order.	2012-03-21 19:01:39 +01:00
pixdesc.h	pixdesc: put components always in the same order.	2012-03-21 19:01:39 +01:00
pixfmt.h	sws/pixfmt/pixdesc: add support for yuva444p	2012-01-28 01:30:41 +01:00
random_seed.c	random_seed: add selftest	2012-02-23 23:44:38 +01:00
random_seed.h	Merge remote-tracking branch 'qatar/master'	2011-11-23 04:02:17 +01:00
rational.c	libavutil: Remove pointless rational test program.	2012-03-26 13:00:09 +02:00
rational.h	Merge remote-tracking branch 'qatar/master'	2011-11-23 04:02:17 +01:00
rc4.c
rc4.h
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'	2012-02-14 01:53:31 +01:00
sha.h	Merge remote-tracking branch 'qatar/master'	2011-11-23 04:02:17 +01:00
softfloat.c
softfloat.h
timecode.c	lavu/timecode: use @see for URL in doxygen.	2012-02-03 00:56:27 +01:00
timecode.h	lavu: add public timecode API.	2012-02-02 14:30:28 +01:00
timer.h	Merge remote-tracking branch 'qatar/master'	2012-01-06 02:45:12 +01:00
timestamp.h	lavu: add timestamp.h header with convenience timestamp utilities	2012-02-09 18:37:58 +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