diff options
| author | Johann <johannkoenig@google.com> | 2011-02-25 11:44:18 -0800 |
|---|---|---|
| committer | Code Review <code-review@webmproject.org> | 2011-02-25 11:44:18 -0800 |
| commit | 31dab574cc1154b65862f86ecc8adf43768e0dca (patch) | |
| tree | 8ed01adc707a63765ab15ca70fa16d693910ae36 /vp8/encoder | |
| parent | da761c9a224f729be410928b146c5d7ec72509b0 (diff) | |
| parent | 6da2018789e08158197be02d83c0cfe9e826fb13 (diff) | |
| download | libvpx-31dab574cc1154b65862f86ecc8adf43768e0dca.tar libvpx-31dab574cc1154b65862f86ecc8adf43768e0dca.tar.gz libvpx-31dab574cc1154b65862f86ecc8adf43768e0dca.tar.bz2 libvpx-31dab574cc1154b65862f86ecc8adf43768e0dca.zip | |
Merge "Remove a second check for invalid ptr in vp8_get_compressed_data"
Diffstat (limited to 'vp8/encoder')
| -rw-r--r-- | vp8/encoder/onyx_if.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index e1a1ed64d..55a7f9c21 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -5221,23 +5221,6 @@ int vp8_get_compressed_data(VP8_PTR ptr, unsigned int *frame_flags, unsigned lon if (cpi->compressor_speed == 2) { vp8_check_gf_quality(cpi); - } - - if (!cpi) - { -#if HAVE_ARMV7 -#if CONFIG_RUNTIME_CPU_DETECT - if (cm->rtcd.flags & HAS_NEON) -#endif - { - vp8_pop_neon(store_reg); - } -#endif - return 0; - } - - if (cpi->compressor_speed == 2) - { vpx_usec_timer_start(&tsctimer); vpx_usec_timer_start(&ticktimer); } |