diff options
| author | James Zern <jzern@google.com> | 2016-06-17 15:22:11 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2016-06-17 18:26:08 -0700 |
| commit | 67edc5e83be285004804c67c5348bbc81503a04d (patch) | |
| tree | f00adb277cd8e3de6afa36ebb764c59a8deeb720 /vpxdec.c | |
| parent | 1417ed28f362a21790ba59a55189d3486a81bff1 (diff) | |
| download | libvpx-67edc5e83be285004804c67c5348bbc81503a04d.tar libvpx-67edc5e83be285004804c67c5348bbc81503a04d.tar.gz libvpx-67edc5e83be285004804c67c5348bbc81503a04d.tar.bz2 libvpx-67edc5e83be285004804c67c5348bbc81503a04d.zip | |
remove vp10
development has moved to the nextgenv2 branch and a snapshot from here
was used to seed aomedia
BUG=b/29457125
Change-Id: Iedaca11ec7870fb3a4e50b2c9ea0c2b056a0d3c0
Diffstat (limited to 'vpxdec.c')
| -rw-r--r-- | vpxdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -28,7 +28,7 @@ #include "vpx_ports/mem_ops.h" #include "vpx_ports/vpx_timer.h" -#if CONFIG_VP8_DECODER || CONFIG_VP9_DECODER || CONFIG_VP10_DECODER +#if CONFIG_VP8_DECODER || CONFIG_VP9_DECODER #include "vpx/vp8dx.h" #endif @@ -641,7 +641,7 @@ static int main_loop(int argc, const char **argv_) { summary = 1; else if (arg_match(&arg, &threadsarg, argi)) cfg.threads = arg_parse_uint(&arg); -#if CONFIG_VP9_DECODER || CONFIG_VP10_DECODER +#if CONFIG_VP9_DECODER else if (arg_match(&arg, &frameparallelarg, argi)) frame_parallel = 1; #endif |