summaryrefslogtreecommitdiff
path: root/vpx/vpx_decoder.h
diff options
context:
space:
mode:
authorJohn Koleszar <jkoleszar@google.com>2013-02-28 16:25:38 -0800
committerJohn Koleszar <jkoleszar@google.com>2013-03-01 11:06:05 -0800
commit69c67c9531b08c1b15985b351677a162739af43e (patch)
tree5e07512832085e972ce4bdc7e96472d2c4f5c545 /vpx/vpx_decoder.h
parentdb4dc6f0c0c30f56d675a489c93b22517eedb9f8 (diff)
parenta07bed2b2b2ca84fdb145ee8e4f1ca100d39915e (diff)
downloadlibvpx-69c67c9531b08c1b15985b351677a162739af43e.tar
libvpx-69c67c9531b08c1b15985b351677a162739af43e.tar.gz
libvpx-69c67c9531b08c1b15985b351677a162739af43e.tar.bz2
libvpx-69c67c9531b08c1b15985b351677a162739af43e.zip
Merge master branch into experimental
Picks up some build system changes, compiler warning fixes, etc. Change-Id: I2712f99e653502818a101a72696ad54018152d4e
Diffstat (limited to 'vpx/vpx_decoder.h')
-rw-r--r--vpx/vpx_decoder.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/vpx/vpx_decoder.h b/vpx/vpx_decoder.h
index d2dec6f5d..ddbc0a6d6 100644
--- a/vpx/vpx_decoder.h
+++ b/vpx/vpx_decoder.h
@@ -65,12 +65,17 @@ extern "C" {
*
* The available flags are specified by VPX_CODEC_USE_* defines.
*/
+#define VPX_CODEC_CAP_FRAME_THREADING 0x200000 /**< Can support frame-based
+ multi-threading */
+
#define VPX_CODEC_USE_POSTPROC 0x10000 /**< Postprocess decoded frame */
#define VPX_CODEC_USE_ERROR_CONCEALMENT 0x20000 /**< Conceal errors in decoded
frames */
#define VPX_CODEC_USE_INPUT_FRAGMENTS 0x40000 /**< The input frame should be
passed to the decoder one
fragment at a time */
+#define VPX_CODEC_USE_FRAME_THREADING 0x80000 /**< Enable frame-based
+ multi-threading */
/*!\brief Stream properties
*