summaryrefslogtreecommitdiff
path: root/vpx/internal/vpx_codec_internal.h
diff options
context:
space:
mode:
authorJohn Koleszar <jkoleszar@google.com>2012-11-06 16:59:01 -0800
committerJohn Koleszar <jkoleszar@google.com>2012-11-07 11:30:16 -0800
commit7b8dfcb5a2cfb01ee7a6009d945d06559b564d06 (patch)
tree29365387746cff257aede84bf84525435b3d948b /vpx/internal/vpx_codec_internal.h
parent82b1a3433df1705e73d83eaeb9731f67c29c8883 (diff)
parent3c8007f19ecd612a9e3c462b83f7ab740546f8f9 (diff)
downloadlibvpx-7b8dfcb5a2cfb01ee7a6009d945d06559b564d06.tar
libvpx-7b8dfcb5a2cfb01ee7a6009d945d06559b564d06.tar.gz
libvpx-7b8dfcb5a2cfb01ee7a6009d945d06559b564d06.tar.bz2
libvpx-7b8dfcb5a2cfb01ee7a6009d945d06559b564d06.zip
Rough merge of master into experimental
Creates a merge between the master and experimental branches. Fixes a number of conflicts in the build system to allow *either* VP8 or VP9 to be built. Specifically either: $ configure --disable-vp9 $ configure --disable-vp8 --disable-unit-tests VP9 still exports its symbols and files as VP8, so that will be resolved in the next commit. Unit tests are broken in VP9, but this isn't a new issue. They are fixed upstream on origin/experimental as of this writing, but rebasing this merge proved difficult, so will tackle that in a second merge commit. Change-Id: I2b7d852c18efd58d1ebc621b8041fe0260442c21
Diffstat (limited to 'vpx/internal/vpx_codec_internal.h')
-rw-r--r--vpx/internal/vpx_codec_internal.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/vpx/internal/vpx_codec_internal.h b/vpx/internal/vpx_codec_internal.h
index 4b7b03067..d7bcd4620 100644
--- a/vpx/internal/vpx_codec_internal.h
+++ b/vpx/internal/vpx_codec_internal.h
@@ -357,11 +357,12 @@ struct vpx_codec_priv {
/*
* Multi-resolution encoding internal configuration
*/
-struct vpx_codec_priv_enc_mr_cfg {
- unsigned int mr_total_resolutions;
- unsigned int mr_encoder_id;
- struct vpx_rational mr_down_sampling_factor;
- void *mr_low_res_mode_info;
+struct vpx_codec_priv_enc_mr_cfg
+{
+ unsigned int mr_total_resolutions;
+ unsigned int mr_encoder_id;
+ struct vpx_rational mr_down_sampling_factor;
+ void* mr_low_res_mode_info;
};
#undef VPX_CTRL_USE_TYPE