diff options
| author | Vignesh Venkatasubramanian <vigneshv@google.com> | 2016-01-19 11:05:09 -0800 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2016-01-22 14:46:43 -0800 |
| commit | 5a9753fca56f0eeb9f61e342b2fccffc364f9426 (patch) | |
| tree | dd33d82febff9fba67a61b711a30504b7f8a827b /libvpx/vp8/decoder/onyxd_int.h | |
| parent | e8544063f08d093e211247d09d74e5bf86976dd5 (diff) | |
| download | android_external_libvpx-5a9753fca56f0eeb9f61e342b2fccffc364f9426.tar.gz android_external_libvpx-5a9753fca56f0eeb9f61e342b2fccffc364f9426.tar.bz2 android_external_libvpx-5a9753fca56f0eeb9f61e342b2fccffc364f9426.zip | |
Merge Conflict Fix CL to lmp-mr1-release for ag/849478
DO NOT MERGE - libvpx: Pull from upstream
Current HEAD: 7105df53d7dc13d5e575bc8df714ec8d1da36b06
BUG=23452792
Change-Id: Ic78176fc369e0bacc71d423e0e2e6075d004aaec
Diffstat (limited to 'libvpx/vp8/decoder/onyxd_int.h')
| -rw-r--r-- | libvpx/vp8/decoder/onyxd_int.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libvpx/vp8/decoder/onyxd_int.h b/libvpx/vp8/decoder/onyxd_int.h index 8ef4894..aa2cc57 100644 --- a/libvpx/vp8/decoder/onyxd_int.h +++ b/libvpx/vp8/decoder/onyxd_int.h @@ -126,7 +126,7 @@ typedef struct VP8D_COMP int independent_partitions; int frame_corrupt_residual; - vp8_decrypt_cb *decrypt_cb; + vpx_decrypt_cb decrypt_cb; void *decrypt_state; } VP8D_COMP; |