diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-07 11:23:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-07 11:28:38 +0200 |
| commit | 79d30321a29dc648d5a475ce5086b2760d5d8c12 (patch) | |
| tree | c712b09b56a0937ca08a1c89365addd8e4e33d4b /tests/ref | |
| parent | 537ef8bebf8a35aab448db6ec876e275a10f0f15 (diff) | |
| parent | 31b2262dca9cc77709d20c45610ec8030e7f9257 (diff) | |
| download | ffmpeg-79d30321a29dc648d5a475ce5086b2760d5d8c12.tar.gz | |
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>
Diffstat (limited to 'tests/ref')
| -rw-r--r-- | tests/ref/lavf/ffm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/ref/lavf/ffm b/tests/ref/lavf/ffm index ce0dcddd36..0494c0ea4a 100644 --- a/tests/ref/lavf/ffm +++ b/tests/ref/lavf/ffm @@ -1,3 +1,3 @@ -e6d8254af2b1ad1f58d60da4d80c6e96 *./tests/data/lavf/lavf.ffm +c76e8f9a9bcd04379dfa3239e272d049 *./tests/data/lavf/lavf.ffm 376832 ./tests/data/lavf/lavf.ffm ./tests/data/lavf/lavf.ffm CRC=0x5b136bb1 |