1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
FFmpeg/tests/ref
Michael Niedermayer 89ddff92a3 Revert "movenc: simplify handling of pcm vs. adpcm vs. other compressed codecs"
This reverts commit 8e8c51318c.

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>
2012-01-22 23:40:24 +01:00
..
acodec Revert "movenc: simplify handling of pcm vs. adpcm vs. other compressed codecs" 2012-01-22 23:40:24 +01:00
fate Merge remote-tracking branch 'qatar/master' 2012-01-20 02:14:54 +01:00
lavf Revert "movenc: simplify handling of pcm vs. adpcm vs. other compressed codecs" 2012-01-22 23:40:24 +01:00
lavfi Merge remote-tracking branch 'qatar/master' 2012-01-10 03:50:41 +01:00
seek
vsynth1 Merge remote-tracking branch 'qatar/master' 2012-01-11 02:44:43 +01:00
vsynth2 Merge remote-tracking branch 'qatar/master' 2012-01-11 02:44:43 +01:00