Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Dec 2013 12:49:16 +0000 (13:49 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Dec 2013 12:49:16 +0000 (13:49 +0100)
commiteb87d1f6784fb488b95fb0932c0367e8d9d0418d
tree0db5e72271bf5d627d4da9f3de5293b54e85d038
parentae330070ee8b985abb011835502b03baacfbb18c
parent9aa053ceded5550b2e538578af383fd89d82364c
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>
libavcodec/Makefile
libavcodec/libvpx.c
libavcodec/libvpx.h
libavcodec/libvpxdec.c
libavcodec/libvpxenc.c