Michael Niedermayer 79d30321a2 Merge remote-tracking branch 'qatar/master' ... * qatar/master: wmaenc: use float planar sample format (e)ac3enc: use planar sample format aacenc: use planar sample format adpcmenc: use planar sample format for adpcm_ima_wav and adpcm_ima_qt adpcmenc: move 'ch' variable to higher scope adpcmenc: fix 3 instances of variable shadowing adpcm_ima_wav: simplify encoding libvorbis: use planar sample format libmp3lame: use planar sample formats vorbisenc: use float planar sample format ffm: do not write or read the audio sample format parseutils: fix parsing of invalid alpha values doc/RELEASE_NOTES: update for the 9 release. smoothstreamingenc: Add a more verbose error message smoothstreamingenc: Ignore the return value from mkdir smoothstreamingenc: Try writing a manifest when opening the muxer smoothstreamingenc: Move the output_chunk_list and write_manifest functions up smoothstreamingenc: Properly return errors from ism_flush to the caller smoothstreamingenc: Check the output UrlContext before accessing it Conflicts: doc/RELEASE_NOTES libavcodec/aacenc.c libavcodec/ac3enc_template.c libavcodec/wmaenc.c tests/ref/lavf/ffm Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-10-07 11:28:38 +02:00
..
fate	fate: Add parseutils test	2012-10-06 09:24:54 +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	nutenc: choose for non audio streams a timebase with finer resolution.	2012-10-02 01:09:12 +02:00
seek	movenc: force video timebase to be 0.1ms precisse at least.	2012-10-04 01:33:49 +02:00
vsynth1	Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'	2012-05-30 01:40:54 +02:00
vsynth2	Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'	2012-05-30 01:40:54 +02:00