diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-10 12:39:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-10 12:39:55 +0100 |
| commit | 1e5656bf8a8ecb6c0aadc8a183b63d5774b0c676 (patch) | |
| tree | aae947248989640cc43246b3320853b7d8397ca1 /libavresample/audio_convert.h | |
| parent | 6732f4350d0869daac2ac94c110e6d3b08d6f87f (diff) | |
| parent | b5f851ed7e59f88b4130a420033d9fe191ec9e2f (diff) | |
| download | ffmpeg-1e5656bf8a8ecb6c0aadc8a183b63d5774b0c676.tar.gz | |
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>
Diffstat (limited to 'libavresample/audio_convert.h')
0 files changed, 0 insertions, 0 deletions