From 89ddff92a3853d5506287ee77cd091d20e320fb6 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 22 Jan 2012 23:23:23 +0100 Subject: Revert "movenc: simplify handling of pcm vs. adpcm vs. other compressed codecs" This reverts commit 8e8c51318c1fe4ae61de578f0823b88aa3fe8222. Fixes Ticket873 Conflicts: tests/ref/acodec/pcm_s16be tests/ref/acodec/pcm_s24be tests/ref/acodec/pcm_s32be tests/ref/acodec/pcm_s8 tests/ref/lavf/mov Approved-by: Baptiste Coudurier Signed-off-by: Michael Niedermayer --- tests/ref/acodec/pcm_s16be | 4 ++-- tests/ref/acodec/pcm_s24be | 4 ++-- tests/ref/acodec/pcm_s32be | 4 ++-- tests/ref/acodec/pcm_s8 | 4 ++-- tests/ref/lavf/mov | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) (limited to 'tests') diff --git a/tests/ref/acodec/pcm_s16be b/tests/ref/acodec/pcm_s16be index e1e0607eee..c5b2a9f840 100644 --- a/tests/ref/acodec/pcm_s16be +++ b/tests/ref/acodec/pcm_s16be @@ -1,4 +1,4 @@ -4529713e8b744edb3e62c4e688a3f987 *./tests/data/acodec/pcm_s16be.mov -1059065 ./tests/data/acodec/pcm_s16be.mov +96079f7b65fdbe991e69bb96a3188217 *./tests/data/acodec/pcm_s16be.mov +1059029 ./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 8a9029dd24..6ebbed2555 100644 --- a/tests/ref/acodec/pcm_s24be +++ b/tests/ref/acodec/pcm_s24be @@ -1,4 +1,4 @@ -8a7b79317738f91a137c7f6519c3df72 *./tests/data/acodec/pcm_s24be.mov -1588265 ./tests/data/acodec/pcm_s24be.mov +74465b486afddaf802300cdbf3b59a11 *./tests/data/acodec/pcm_s24be.mov +1588229 ./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 e6dc46cee5..f6df3adc88 100644 --- a/tests/ref/acodec/pcm_s32be +++ b/tests/ref/acodec/pcm_s32be @@ -1,4 +1,4 @@ -c9f29c97890f69796faa227c3c08c3d8 *./tests/data/acodec/pcm_s32be.mov -2117465 ./tests/data/acodec/pcm_s32be.mov +ac3822c11273a25005dfd6aa64b255df *./tests/data/acodec/pcm_s32be.mov +2117429 ./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 aa5ce11ee0..4877a77489 100644 --- a/tests/ref/acodec/pcm_s8 +++ b/tests/ref/acodec/pcm_s8 @@ -1,4 +1,4 @@ -bfd442109b661daf8ee7a468d9d6b944 *./tests/data/acodec/pcm_s8.mov -529865 ./tests/data/acodec/pcm_s8.mov +111d465266385298fde83005402ac171 *./tests/data/acodec/pcm_s8.mov +529829 ./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 a28990328b..619489c6b3 100644 --- a/tests/ref/lavf/mov +++ b/tests/ref/lavf/mov @@ -1,3 +1,3 @@ -37c9c1272d9c524b44692e9192d82033 *./tests/data/lavf/lavf.mov -357857 ./tests/data/lavf/lavf.mov +9a0b239ff596da58debcf210dece3985 *./tests/data/lavf/lavf.mov +357821 ./tests/data/lavf/lavf.mov ./tests/data/lavf/lavf.mov CRC=0x2f6a9b26 -- cgit v1.2.3