[FFmpeg-cvslog] Merge commit 'b5f851ed7e59f88b4130a420033d9fe191ec9e2f'

Michael Niedermayer git at videolan.org
Mon Feb 10 12:50:30 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb 10 12:39:55 2014 +0100| [1e5656bf8a8ecb6c0aadc8a183b63d5774b0c676] | committer: Michael Niedermayer

Merge commit 'b5f851ed7e59f88b4130a420033d9fe191ec9e2f'

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

Conflicts:
	tests/lavf-regression.sh

See: 28caf13ac394df5424a25304bda4608441bd85ec
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1e5656bf8a8ecb6c0aadc8a183b63d5774b0c676
---





More information about the ffmpeg-cvslog mailing list