diff options
author | Johann Koenig <johannkoenig@google.com> | 2016-09-29 23:16:44 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-09-29 23:16:45 +0000 |
commit | ad55b1d270db717a1f5c1c4966e7aecf9a563e5f (patch) | |
tree | 34974f71b2128ee9b8fec127682f3444166e603f /vp8/decoder/onyxd_if.c | |
parent | 7b9c86167eb7161ab98cab66fab6e63a2c76c29e (diff) | |
parent | 1364cb58b4372c0f6f377c938f1eca789ffd120c (diff) | |
download | libvpx-ad55b1d270db717a1f5c1c4966e7aecf9a563e5f.tar libvpx-ad55b1d270db717a1f5c1c4966e7aecf9a563e5f.tar.gz libvpx-ad55b1d270db717a1f5c1c4966e7aecf9a563e5f.tar.bz2 libvpx-ad55b1d270db717a1f5c1c4966e7aecf9a563e5f.zip |
Merge changes Ia3e9122f,Id33eb6c8,I956bd8ce
* changes:
Remove vp8_clear_system_state
vpx_dsp: clean up rtcd
vp8: clean up rtcd
Diffstat (limited to 'vp8/decoder/onyxd_if.c')
-rw-r--r-- | vp8/decoder/onyxd_if.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/vp8/decoder/onyxd_if.c b/vp8/decoder/onyxd_if.c index c6b566036..5b3ae1ce7 100644 --- a/vp8/decoder/onyxd_if.c +++ b/vp8/decoder/onyxd_if.c @@ -29,6 +29,7 @@ #include "./vpx_scale_rtcd.h" #include "vpx_scale/vpx_scale.h" #include "vp8/common/systemdependent.h" +#include "vpx_ports/system_state.h" #include "vpx_ports/vpx_once.h" #include "vpx_ports/vpx_timer.h" #include "detokenize.h" @@ -352,7 +353,7 @@ int vp8dx_receive_compressed_data(VP8D_COMP *pbi, size_t size, goto decode_exit; } - vp8_clear_system_state(); + vpx_clear_system_state(); if (cm->show_frame) { cm->current_video_frame++; @@ -383,7 +384,7 @@ int vp8dx_receive_compressed_data(VP8D_COMP *pbi, size_t size, decode_exit: pbi->common.error.setjmp = 0; - vp8_clear_system_state(); + vpx_clear_system_state(); return retcode; } int vp8dx_get_raw_frame(VP8D_COMP *pbi, YV12_BUFFER_CONFIG *sd, @@ -416,7 +417,7 @@ int vp8dx_get_raw_frame(VP8D_COMP *pbi, YV12_BUFFER_CONFIG *sd, } #endif /*!CONFIG_POSTPROC*/ - vp8_clear_system_state(); + vpx_clear_system_state(); return ret; } @@ -447,7 +448,7 @@ int vp8_create_decoder_instances(struct frame_buffers *fb, VP8D_CONFIG *oxcf) { if (setjmp(fb->pbi[0]->common.error.jmp)) { vp8_remove_decoder_instances(fb); memset(fb->pbi, 0, sizeof(fb->pbi) / sizeof(fb->pbi[0])); - vp8_clear_system_state(); + vpx_clear_system_state(); return VPX_CODEC_ERROR; } |