aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/libvpxenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-23 21:59:34 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-23 21:59:34 +0100
commit8f140a8ec3b8be57892be7103998da3321e4aeb8 (patch)
tree4865bb7315d6fff6dd9bf8687ad67d62fa43ba1e /libavcodec/libvpxenc.c
parent9ad8f55edaf20a73ebf42ad9f0398e96a1726690 (diff)
parentce52869c22738ad584995d48103ce3aa2301736b (diff)
downloadffmpeg-8f140a8ec3b8be57892be7103998da3321e4aeb8.tar.gz
Merge commit 'ce52869c22738ad584995d48103ce3aa2301736b'
* commit 'ce52869c22738ad584995d48103ce3aa2301736b': fate: Rename fate-dts test to fate-dca-core Conflicts: tests/fate/audio.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libvpxenc.c')
0 files changed, 0 insertions, 0 deletions