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/encoder/bitstream.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/encoder/bitstream.h')
| -rw-r--r-- | libvpx/vp8/encoder/bitstream.h | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/libvpx/vp8/encoder/bitstream.h b/libvpx/vp8/encoder/bitstream.h index eef2d79..de69805 100644 --- a/libvpx/vp8/encoder/bitstream.h +++ b/libvpx/vp8/encoder/bitstream.h @@ -16,36 +16,7 @@ extern "C" { #endif -#if HAVE_EDSP -void vp8cx_pack_tokens_armv5(vp8_writer *w, const TOKENEXTRA *p, int xcount, - const vp8_token *, - const vp8_extra_bit_struct *, - const vp8_tree_index *); -void vp8cx_pack_tokens_into_partitions_armv5(VP8_COMP *, - unsigned char * cx_data, - const unsigned char *cx_data_end, - int num_parts, - const vp8_token *, - const vp8_extra_bit_struct *, - const vp8_tree_index *); -void vp8cx_pack_mb_row_tokens_armv5(VP8_COMP *cpi, vp8_writer *w, - const vp8_token *, - const vp8_extra_bit_struct *, - const vp8_tree_index *); -# define pack_tokens(a,b,c) \ - vp8cx_pack_tokens_armv5(a,b,c,vp8_coef_encodings,vp8_extra_bits,vp8_coef_tree) -# define pack_tokens_into_partitions(a,b,c,d) \ - vp8cx_pack_tokens_into_partitions_armv5(a,b,c,d,vp8_coef_encodings,vp8_extra_bits,vp8_coef_tree) -# define pack_mb_row_tokens(a,b) \ - vp8cx_pack_mb_row_tokens_armv5(a,b,vp8_coef_encodings,vp8_extra_bits,vp8_coef_tree) -#else - -void vp8_pack_tokens_c(vp8_writer *w, const TOKENEXTRA *p, int xcount); - -# define pack_tokens(a,b,c) vp8_pack_tokens_c(a,b,c) -# define pack_tokens_into_partitions(a,b,c,d) pack_tokens_into_partitions_c(a,b,c,d) -# define pack_mb_row_tokens(a,b) pack_mb_row_tokens_c(a,b) -#endif +void vp8_pack_tokens(vp8_writer *w, const TOKENEXTRA *p, int xcount); #ifdef __cplusplus } // extern "C" |