diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-10 01:25:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-10 02:01:03 +0100 |
| commit | c59b80c8d3e46f176172d582f27c14d772e306fc (patch) | |
| tree | 8457ccf4abee25effcc243b22764b969127493d7 /tests | |
| parent | 5b98ea1b7309fd43694b92e990439636630f408a (diff) | |
| parent | 4c386333529dd773e673e1366d1f6243d2c5af92 (diff) | |
| download | ffmpeg-c59b80c8d3e46f176172d582f27c14d772e306fc.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
isom: sort and pretty-print codec_movaudio_tags[]
isom: remove pointless comments in codec_movaudio_tags[]
isom: remove commented-out tag for vorbis
movenc: write 'chan' tag for AC-3 in MOV
mov: add support for reading and writing the 'chan' tag
audioconvert: add some additional channel and channel layout macros
audioconvert: change 7.1 "wide" layout to use side surround channels
movenc: simplify handling of pcm vs. adpcm vs. other compressed codecs
doc: update documentation to use avconv
doc: update demuxers section
doc: extend external library coverage
doc: split platform specific information
doc: port the git-howto to texinfo
doc: provide fallback css and customize @float
doc: document fate in a texinfo
doxy: change hue value to match our green
Conflicts:
doc/fate.txt
doc/ffserver.texi
doc/general.texi
doc/muxers.texi
doc/protocols.texi
doc/t2h.init
libavformat/isom.c
libavformat/mov.c
libavutil/avutil.h
tests/ref/acodec/pcm_s16be
tests/ref/acodec/pcm_s24be
tests/ref/acodec/pcm_s32be
tests/ref/acodec/pcm_s8
tests/ref/lavf/mov
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ref/acodec/pcm_s16be | 4 | ||||
| -rw-r--r-- | tests/ref/acodec/pcm_s24be | 4 | ||||
| -rw-r--r-- | tests/ref/acodec/pcm_s32be | 4 | ||||
| -rw-r--r-- | tests/ref/acodec/pcm_s8 | 4 | ||||
| -rw-r--r-- | tests/ref/lavf/mov | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/tests/ref/acodec/pcm_s16be b/tests/ref/acodec/pcm_s16be index e027f4ec56..a4d8f1034f 100644 --- a/tests/ref/acodec/pcm_s16be +++ b/tests/ref/acodec/pcm_s16be @@ -1,4 +1,4 @@ -aeec610f33d8eec7031c5c6a9aab4cc0 *./tests/data/acodec/pcm_s16be.mov -1059029 ./tests/data/acodec/pcm_s16be.mov +d07e475322765c20b1fcdb822ad5dc04 *./tests/data/acodec/pcm_s16be.mov +1059065 ./tests/data/acodec/pcm_s16be.mov 64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm_s16be.acodec.out.wav stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400 diff --git a/tests/ref/acodec/pcm_s24be b/tests/ref/acodec/pcm_s24be index 282868e2b5..5fb5aeec76 100644 --- a/tests/ref/acodec/pcm_s24be +++ b/tests/ref/acodec/pcm_s24be @@ -1,4 +1,4 @@ -9ea74aa6d09fcfe9a1e232efecfb07fe *./tests/data/acodec/pcm_s24be.mov -1588229 ./tests/data/acodec/pcm_s24be.mov +f66d9543a4e04346818e802c4f2d7a30 *./tests/data/acodec/pcm_s24be.mov +1588265 ./tests/data/acodec/pcm_s24be.mov 64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm_s24be.acodec.out.wav stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400 diff --git a/tests/ref/acodec/pcm_s32be b/tests/ref/acodec/pcm_s32be index dd8e31e095..89646b4885 100644 --- a/tests/ref/acodec/pcm_s32be +++ b/tests/ref/acodec/pcm_s32be @@ -1,4 +1,4 @@ -25535c11babbc971b6a958e92feaee37 *./tests/data/acodec/pcm_s32be.mov -2117429 ./tests/data/acodec/pcm_s32be.mov +09c919947211de14b3ad0e7603e5b44e *./tests/data/acodec/pcm_s32be.mov +2117465 ./tests/data/acodec/pcm_s32be.mov 64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm_s32be.acodec.out.wav stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400 diff --git a/tests/ref/acodec/pcm_s8 b/tests/ref/acodec/pcm_s8 index e7c3c2e274..5fc08f98ce 100644 --- a/tests/ref/acodec/pcm_s8 +++ b/tests/ref/acodec/pcm_s8 @@ -1,4 +1,4 @@ -d63813e9255a74324ea4559d6a8a1f7c *./tests/data/acodec/pcm_s8.mov -529829 ./tests/data/acodec/pcm_s8.mov +52d8c65c4987227979785d5ac2030175 *./tests/data/acodec/pcm_s8.mov +529865 ./tests/data/acodec/pcm_s8.mov 651d4eb8d98dfcdda96ae6c43d8f156b *./tests/data/pcm_s8.acodec.out.wav stddev: 147.89 PSNR: 52.93 MAXDIFF: 255 bytes: 1058400/ 1058400 diff --git a/tests/ref/lavf/mov b/tests/ref/lavf/mov index 776379690d..77d1abb70f 100644 --- a/tests/ref/lavf/mov +++ b/tests/ref/lavf/mov @@ -1,3 +1,3 @@ -93ed3b20190daa51aeb19f62f939d04a *./tests/data/lavf/lavf.mov -357821 ./tests/data/lavf/lavf.mov +3340b7ffe1b1d98a50622bd53f786d41 *./tests/data/lavf/lavf.mov +357857 ./tests/data/lavf/lavf.mov ./tests/data/lavf/lavf.mov CRC=0x2f6a9b26 |