diff options
| author | Christopher Ferris <cferris@google.com> | 2015-03-20 10:09:34 -0700 |
|---|---|---|
| committer | Christopher Ferris <cferris@google.com> | 2015-03-20 13:09:05 -0700 |
| commit | fe8ec911ccb70006170d72031e6d7c0aed867105 (patch) | |
| tree | 5b9d4b40c679ea0c5fd061de9539581bcb4130c8 | |
| parent | 7ed7ddf7e571b6d490537f43e043ea067826fd72 (diff) | |
| download | android_hardware_intel_common_omx-components-fe8ec911ccb70006170d72031e6d7c0aed867105.tar.gz android_hardware_intel_common_omx-components-fe8ec911ccb70006170d72031e6d7c0aed867105.tar.bz2 android_hardware_intel_common_omx-components-fe8ec911ccb70006170d72031e6d7c0aed867105.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 commit 1b2eb1beaa8da59efe10f8557c3288c294a03bb7 from aosp)
Change-Id: I8e8e8b222259312985c4abd574489315ea2d5cb4
| -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 |