Merge commit 'b5f851ed'

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

Conflicts:
	tests/lavf-regression.sh

See: 28caf13aMerged-by: Michael Niedermayer <michaelni@gmx.at>

tests/lavf-regression.sh

@@ -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