From: John Koleszar Date: Sat, 5 Mar 2011 05:05:07 +0000 (-0500) Subject: Merge remote branch 'origin/master' into experimental X-Git-Tag: v1.3.0~1217^2~489 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=01eb7c28742e907500279cff53184361a26e0847;p=libvpx Merge remote branch 'origin/master' into experimental Change-Id: I70ac5a4f8388a7bfa058178c0ae53f6bdb0bb6e5 --- 01eb7c28742e907500279cff53184361a26e0847 diff --cc vpx/vp8cx.h index 5da4fe2b4,5ff6bdcfb..f024fcefc --- a/vpx/vp8cx.h +++ b/vpx/vp8cx.h @@@ -31,18 -32,9 +32,19 @@@ */ extern vpx_codec_iface_t vpx_codec_vp8_cx_algo; extern vpx_codec_iface_t* vpx_codec_vp8_cx(void); + /*!@} - end algorithm interface member group*/ +#if CONFIG_EXPERIMENTAL +/*!\brief Algorithm interface for VP8 experimental branch + * + * This interface provides the ability to encode using the "experimental" + * VP8 variant, which is bitstream incompatible with the default VP8 encoder. + */ +extern vpx_codec_iface_t vpx_codec_vp8x_cx_algo; +#endif + + /* * Algorithm Flags */