diff options
| author | Yaowu Xu <yaowu@google.com> | 2013-11-15 15:20:23 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-11-15 15:20:23 -0800 |
| commit | dc90541563331da238e9a9d82c7ec42af2a9f4be (patch) | |
| tree | fad82673bbbfae90f011f80ea8d6958d4ab8ba9f /vp9 | |
| parent | 3b9befe52e06437b370ac381bd077d45f8e71daa (diff) | |
| parent | 49cbe4580d4f02cd55a72c6442f33a249321e605 (diff) | |
| download | libvpx-dc90541563331da238e9a9d82c7ec42af2a9f4be.tar libvpx-dc90541563331da238e9a9d82c7ec42af2a9f4be.tar.gz libvpx-dc90541563331da238e9a9d82c7ec42af2a9f4be.tar.bz2 libvpx-dc90541563331da238e9a9d82c7ec42af2a9f4be.zip | |
Merge "Renamed two files"
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/decoder/vp9_decodeframe.c (renamed from vp9/decoder/vp9_decodframe.c) | 2 | ||||
| -rw-r--r-- | vp9/decoder/vp9_decodeframe.h (renamed from vp9/decoder/vp9_decodframe.h) | 6 | ||||
| -rw-r--r-- | vp9/decoder/vp9_decodemv.c | 2 | ||||
| -rw-r--r-- | vp9/decoder/vp9_onyxd_if.c | 2 | ||||
| -rw-r--r-- | vp9/vp9dx.mk | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodeframe.c index 3c4781bde..cc82d8341 100644 --- a/vp9/decoder/vp9_decodframe.c +++ b/vp9/decoder/vp9_decodeframe.c @@ -28,7 +28,7 @@ #include "vp9/common/vp9_tile_common.h" #include "vp9/decoder/vp9_dboolhuff.h" -#include "vp9/decoder/vp9_decodframe.h" +#include "vp9/decoder/vp9_decodeframe.h" #include "vp9/decoder/vp9_detokenize.h" #include "vp9/decoder/vp9_decodemv.h" #include "vp9/decoder/vp9_dsubexp.h" diff --git a/vp9/decoder/vp9_decodframe.h b/vp9/decoder/vp9_decodeframe.h index c665f6fc1..7245a9845 100644 --- a/vp9/decoder/vp9_decodframe.h +++ b/vp9/decoder/vp9_decodeframe.h @@ -9,8 +9,8 @@ */ -#ifndef VP9_DECODER_VP9_DECODFRAME_H_ -#define VP9_DECODER_VP9_DECODFRAME_H_ +#ifndef VP9_DECODER_VP9_DECODEFRAME_H_ +#define VP9_DECODER_VP9_DECODEFRAME_H_ struct VP9Common; struct VP9Decompressor; @@ -18,4 +18,4 @@ struct VP9Decompressor; void vp9_init_dequantizer(struct VP9Common *cm); int vp9_decode_frame(struct VP9Decompressor *cpi, const uint8_t **p_data_end); -#endif // VP9_DECODER_VP9_DECODFRAME_H_ +#endif // VP9_DECODER_VP9_DECODEFRAME_H_ diff --git a/vp9/decoder/vp9_decodemv.c b/vp9/decoder/vp9_decodemv.c index b948429b3..9c1f61000 100644 --- a/vp9/decoder/vp9_decodemv.c +++ b/vp9/decoder/vp9_decodemv.c @@ -21,7 +21,7 @@ #include "vp9/common/vp9_seg_common.h" #include "vp9/decoder/vp9_decodemv.h" -#include "vp9/decoder/vp9_decodframe.h" +#include "vp9/decoder/vp9_decodeframe.h" #include "vp9/decoder/vp9_onyxd_int.h" #include "vp9/decoder/vp9_treereader.h" diff --git a/vp9/decoder/vp9_onyxd_if.c b/vp9/decoder/vp9_onyxd_if.c index cb45d3702..7c0f91d88 100644 --- a/vp9/decoder/vp9_onyxd_if.c +++ b/vp9/decoder/vp9_onyxd_if.c @@ -25,7 +25,7 @@ #include "vpx_scale/vpx_scale.h" #include "vp9/common/vp9_systemdependent.h" #include "vpx_ports/vpx_timer.h" -#include "vp9/decoder/vp9_decodframe.h" +#include "vp9/decoder/vp9_decodeframe.h" #include "vp9/decoder/vp9_detokenize.h" #include "./vpx_scale_rtcd.h" diff --git a/vp9/vp9dx.mk b/vp9/vp9dx.mk index 3a27cdd04..7e76682d4 100644 --- a/vp9/vp9dx.mk +++ b/vp9/vp9dx.mk @@ -19,8 +19,8 @@ VP9_DX_SRCS-yes += vp9_dx_iface.c VP9_DX_SRCS-yes += decoder/vp9_dboolhuff.c VP9_DX_SRCS-yes += decoder/vp9_decodemv.c -VP9_DX_SRCS-yes += decoder/vp9_decodframe.c -VP9_DX_SRCS-yes += decoder/vp9_decodframe.h +VP9_DX_SRCS-yes += decoder/vp9_decodeframe.c +VP9_DX_SRCS-yes += decoder/vp9_decodeframe.h VP9_DX_SRCS-yes += decoder/vp9_detokenize.c VP9_DX_SRCS-yes += decoder/vp9_dboolhuff.h VP9_DX_SRCS-yes += decoder/vp9_read_bit_buffer.h |