Michael Niedermayer de31814ab0 Merge commit 'b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6' ... * commit 'b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6': avio: introduce avio_closep mpegtsenc: set muxing type notification to verbose vc1dec: Use correct spelling of "opposite" a64multienc: change mc_frame_counter to unsigned arm: call arm-specific rv34dsp init functions under if (ARCH_ARM) svq1: Drop a bunch of useless parentheses parseutils-test: do not print numerical error codes svq1: K&R formatting cosmetics Conflicts: doc/APIchanges libavcodec/svq1dec.c libavcodec/svq1enc.c libavformat/version.h libavutil/parseutils.c tests/ref/fate/parseutils Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-10-11 14:03:12 +02:00
..
fate	Merge commit 'b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6'	2012-10-11 14:03:12 +02:00
lavf	Merge remote-tracking branch 'qatar/master'	2012-10-07 11:28:38 +02:00
lavf-fate	mp3enc: add lame tag with start padding info	2012-07-14 17:20:22 +02:00
lavfi	fate: add vf_idet filter to lavfi regression tests	2012-10-11 02:21:28 +02:00
seek	movenc: force video timebase to be 0.1ms precisse at least.	2012-10-04 01:33:49 +02:00
vsynth1
vsynth2