diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-22 23:23:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-22 23:40:24 +0100 |
| commit | 89ddff92a3853d5506287ee77cd091d20e320fb6 (patch) | |
| tree | 5a3e909d8fdcadb284aca29529749afb1683eb37 /tests/ref/lavf/mov | |
| parent | 9c909e8e793f1122af42b07ce18c08840e4bf6e5 (diff) | |
| download | ffmpeg-89ddff92a3853d5506287ee77cd091d20e320fb6.tar.gz | |
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 <baptiste.coudurier@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/lavf/mov')
| -rw-r--r-- | tests/ref/lavf/mov | 4 |
1 files changed, 2 insertions, 2 deletions
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 |