2 Commits

Author	SHA1	Message	Date
Michael Niedermayer	eb87d1f678	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>	2013-12-08 13:49:16 +01:00
Guillaume Martres	9aa053cede	libvpx: do not mark VP9 as experimental when using libvpx >= 1.3.0 ... Signed-off-by: Diego Biurrun <diego@biurrun.de>	2013-12-08 00:28:27 +01:00