]> git.sesse.net Git - ffmpeg/commit
Merge commit 'b5f851ed7e59f88b4130a420033d9fe191ec9e2f'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Feb 2014 11:39:55 +0000 (12:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Feb 2014 11:39:55 +0000 (12:39 +0100)
commit1e5656bf8a8ecb6c0aadc8a183b63d5774b0c676
treeaae947248989640cc43246b3320853b7d8397ca1
parent6732f4350d0869daac2ac94c110e6d3b08d6f87f
parentb5f851ed7e59f88b4130a420033d9fe191ec9e2f
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@gmx.at>
tests/lavf-regression.sh