FFmpeg/tests/ref/lavf/ffm

c76e8f9a9bcd04379dfa3239e272d049 *./tests/data/lavf/lavf.ffm
376832 ./tests/data/lavf/lavf.ffm
./tests/data/lavf/lavf.ffm CRC=0x5b136bb1
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:23:29 +02:00			`c76e8f9a9bcd04379dfa3239e272d049 *./tests/data/lavf/lavf.ffm`
Place regression test output files in subdirs per family Originally committed as revision 22155 to svn://svn.ffmpeg.org/ffmpeg/trunk 2010-03-02 21:41:52 +00:00			`376832 ./tests/data/lavf/lavf.ffm`
mpegvideo_enc: reduce QMAT_SHIFT to avoid overflow in dnxhd Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 2012-09-20 22:29:03 +02:00			`./tests/data/lavf/lavf.ffm CRC=0x5b136bb1`