diff options
| author | Suman Sunkara <sunkaras@google.com> | 2010-11-16 15:09:26 -0500 |
|---|---|---|
| committer | Suman Sunkara <sunkaras@google.com> | 2010-11-16 16:30:59 -0500 |
| commit | 4b3f72001de952aaf3874d3ce2dca3cb3fbe3928 (patch) | |
| tree | 754d87a4fa5cae908388f0a26b2affad7cd8a523 /vpx/exports | |
| parent | b9a18344cf8e5283928525c5ac0897ede79f9e57 (diff) | |
| parent | 00fe7441e9c5cbd898a8382d49cf9396d8482464 (diff) | |
| download | libvpx-4b3f72001de952aaf3874d3ce2dca3cb3fbe3928.tar libvpx-4b3f72001de952aaf3874d3ce2dca3cb3fbe3928.tar.gz libvpx-4b3f72001de952aaf3874d3ce2dca3cb3fbe3928.tar.bz2 libvpx-4b3f72001de952aaf3874d3ce2dca3cb3fbe3928.zip | |
Merge branch 'experimental' of ssh://on2-git.corp.google.com:29418/libvpx into test
Conflicts:
vp8/common/blockd.h
vp8/decoder/decodemv.c
vp8/decoder/decodframe.c
vp8/decoder/demode.c
vp8/decoder/onyxd_if.c
vp8/decoder/onyxd_int.h
vp8/encoder/encodeframe.c
Change-Id: Ic379f4dffaded9796dc19d56be304d3f8527c61f
Diffstat (limited to 'vpx/exports')
| -rw-r--r-- | vpx/exports | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/vpx/exports b/vpx/exports deleted file mode 100644 index f5e7473bc..000000000 --- a/vpx/exports +++ /dev/null @@ -1,17 +0,0 @@ -text vpx_dec_control -text vpx_dec_decode -text vpx_dec_destroy -text vpx_dec_err_to_string -text vpx_dec_error -text vpx_dec_error_detail -text vpx_dec_get_caps -text vpx_dec_get_frame -text vpx_dec_get_mem_map -text vpx_dec_get_stream_info -text vpx_dec_iface_name -text vpx_dec_init_ver -text vpx_dec_peek_stream_info -text vpx_dec_register_put_frame_cb -text vpx_dec_register_put_slice_cb -text vpx_dec_set_mem_map -text vpx_dec_xma_init_ver |