aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/x86
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-12-08 13:49:16 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-12-08 13:49:16 +0100
commiteb87d1f6784fb488b95fb0932c0367e8d9d0418d (patch)
tree0db5e72271bf5d627d4da9f3de5293b54e85d038 /libavcodec/x86
parentae330070ee8b985abb011835502b03baacfbb18c (diff)
parent9aa053ceded5550b2e538578af383fd89d82364c (diff)
downloadffmpeg-eb87d1f6784fb488b95fb0932c0367e8d9d0418d.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: libvpx: do not mark VP9 as experimental when using libvpx >= 1.3.0 Conflicts: libavcodec/libvpxdec.c libavcodec/libvpxenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86')
0 files changed, 0 insertions, 0 deletions