diff options
| author | Christopher Ferris <cferris@google.com> | 2015-03-20 10:09:34 -0700 |
|---|---|---|
| committer | Christopher Ferris <cferris@google.com> | 2015-03-20 15:16:53 -0700 |
| commit | 64be139e24686ab70ea8f96c416db8f022d6fff2 (patch) | |
| tree | 5ed8ff86e3b03565ce7e3b33f5939d5209e333df | |
| parent | 8bd55dabe11dd10f3d574c80e7f83cfcc3761623 (diff) | |
| download | android_hardware_intel_common_omx-components-64be139e24686ab70ea8f96c416db8f022d6fff2.tar.gz android_hardware_intel_common_omx-components-64be139e24686ab70ea8f96c416db8f022d6fff2.tar.bz2 android_hardware_intel_common_omx-components-64be139e24686ab70ea8f96c416db8f022d6fff2.zip | |
Move init of variable after setjmp.
The gcc 4.9 compiler might not store this variable on the stack, so
it needs to be initialized after the setjmp.
(cherry picked from commit fe8ec911ccb70006170d72031e6d7c0aed867105)
Change-Id: Ie9585c8c3c075b0327093fd0f338a26edb5bb3e7
| -rw-r--r-- | videocodec/libvpx_internal/libvpx/vp8/encoder/onyx_if.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/videocodec/libvpx_internal/libvpx/vp8/encoder/onyx_if.c b/videocodec/libvpx_internal/libvpx/vp8/encoder/onyx_if.c index 35f439e..fd15718 100644 --- a/videocodec/libvpx_internal/libvpx/vp8/encoder/onyx_if.c +++ b/videocodec/libvpx_internal/libvpx/vp8/encoder/onyx_if.c @@ -4897,7 +4897,7 @@ int vp8_get_compressed_data(VP8_COMP *cpi, unsigned int *frame_flags, unsigned l struct vpx_usec_timer tsctimer; struct vpx_usec_timer ticktimer; struct vpx_usec_timer cmptimer; - YV12_BUFFER_CONFIG *force_src_buffer = NULL; + YV12_BUFFER_CONFIG *force_src_buffer; if (!cpi) return -1; @@ -4910,6 +4910,7 @@ int vp8_get_compressed_data(VP8_COMP *cpi, unsigned int *frame_flags, unsigned l return VPX_CODEC_CORRUPT_FRAME; } + force_src_buffer = NULL; cpi->common.error.setjmp = 1; #if HAVE_NEON |