Merge commit 'b5f851ed7e59f88b4130a420033d9fe191ec9e2f'

* commit 'b5f851ed7e59f88b4130a420033d9fe191ec9e2f':
  FATE: force FLAC in the lavf ogg test

Conflicts:
	tests/lavf-regression.sh

See: 28caf13ac3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-02-10 12:39:55 +01:00
commit 1e5656bf8a

View File

@ -303,7 +303,7 @@ do_audio_only s16.voc "-ac 2" "-acodec pcm_s16le"
fi
if [ -n "$do_ogg" ] ; then
do_audio_only ogg "" "-acodec flac"
do_audio_only ogg "" "-c:a flac"
fi
if [ -n "$do_rso" ] ; then