summaryrefslogtreecommitdiff
path: root/libswresample/version.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-15 14:50:12 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-05-15 18:20:17 +0200
commit2c7d3ecfc962fe2d2afa84cd347136060468fe0e (patch)
treec41ba636d60abccf4acaab315de41823967a033e /libswresample/version.h
parent8b96f31817be57f0542834e7d6bdaecf2db6fd50 (diff)
parentb70d7a4ac72d23f3448f3b08b770fdf5f57de222 (diff)
Merge commit 'b70d7a4ac72d23f3448f3b08b770fdf5f57de222'
* commit 'b70d7a4ac72d23f3448f3b08b770fdf5f57de222': lavc: add a native Opus decoder. Conflicts: Changelog configure libavcodec/version.h Fate tests pass with both avresample as well as swresample based opus decoder, but are disabled (reference files are very large so i want to think a day or 2 about if theres an alternative or if they could be avoided, they also dont match the official samples) Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/version.h')
0 files changed, 0 insertions, 0 deletions