diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-14 22:11:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-14 22:12:16 +0200 |
| commit | a65d6e17bd04e11b863c8f80d028af0058440a68 (patch) | |
| tree | 4b8043851c2c1c6b55b5b2f7c54066559d15fe94 /libavcodec/escape130.c | |
| parent | 8bbadc9b6ec71abbd9dab854c47027b949997af0 (diff) | |
| parent | f9900822fc5f0b0c7242ca318290c090bd5d0af0 (diff) | |
| download | ffmpeg-a65d6e17bd04e11b863c8f80d028af0058440a68.tar.gz | |
Merge commit 'f9900822fc5f0b0c7242ca318290c090bd5d0af0'
* commit 'f9900822fc5f0b0c7242ca318290c090bd5d0af0':
fate: Use the correct, local path to samples for opus reference files
Conflicts:
tests/fate/opus.mak
See: ad7de82218e9ee2232e53ab49cda85767cf800e5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/escape130.c')
0 files changed, 0 insertions, 0 deletions