Revert "movenc: simplify handling of pcm vs. adpcm vs. other compressed codecs"
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Jan 2012 22:23:23 +0000 (23:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Jan 2012 22:40:24 +0000 (23:40 +0100)
commit89ddff92a3853d5506287ee77cd091d20e320fb6
tree5a3e909d8fdcadb284aca29529749afb1683eb37
parent9c909e8e793f1122af42b07ce18c08840e4bf6e5
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>
libavformat/movenc.c
tests/ref/acodec/pcm_s16be
tests/ref/acodec/pcm_s24be
tests/ref/acodec/pcm_s32be
tests/ref/acodec/pcm_s8
tests/ref/lavf/mov