You've already forked FFmpeg
							
							
				mirror of
				https://github.com/FFmpeg/FFmpeg.git
				synced 2025-10-30 23:18:11 +02:00 
			
		
		
		
	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:
		| @@ -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 | ||||
|   | ||||
		Reference in New Issue
	
	Block a user