diff options
| author | Clément Bœsch <u@pkh.me> | 2016-07-29 11:01:36 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-07-29 11:01:36 +0200 |
| commit | 15b26e88cb7c775e0e7a422ab6b088b5690f31ad (patch) | |
| tree | a5e2705a74a0ef8f98b51d364fb510169cc7607e /libavcodec/mips | |
| parent | 7dda97fb86ff615e6a892052545d955816bb58f6 (diff) | |
| parent | 9df889a5f116c1ee78c2f239e0ba599c492431aa (diff) | |
| download | ffmpeg-15b26e88cb7c775e0e7a422ab6b088b5690f31ad.tar.gz | |
Merge commit '9df889a5f116c1ee78c2f239e0ba599c492431aa'
* commit '9df889a5f116c1ee78c2f239e0ba599c492431aa':
h264: rename h264.[ch] to h264dec.[ch]
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/mips')
| -rw-r--r-- | libavcodec/mips/h264chroma_mips.h | 2 | ||||
| -rw-r--r-- | libavcodec/mips/h264dsp_mips.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mips/h264chroma_mips.h b/libavcodec/mips/h264chroma_mips.h index 0ef6c74691..6e6127d8a7 100644 --- a/libavcodec/mips/h264chroma_mips.h +++ b/libavcodec/mips/h264chroma_mips.h @@ -21,7 +21,7 @@ #ifndef AVCODEC_MIPS_H264CHROMA_MIPS_H #define AVCODEC_MIPS_H264CHROMA_MIPS_H -#include "libavcodec/h264.h" +#include "libavcodec/h264dec.h" void ff_put_h264_chroma_mc8_msa(uint8_t *dst, uint8_t *src, int stride, int height, int x, int y); void ff_put_h264_chroma_mc4_msa(uint8_t *dst, uint8_t *src, int stride, diff --git a/libavcodec/mips/h264dsp_mips.h b/libavcodec/mips/h264dsp_mips.h index 2fdfd11d95..a578457bd2 100644 --- a/libavcodec/mips/h264dsp_mips.h +++ b/libavcodec/mips/h264dsp_mips.h @@ -22,7 +22,7 @@ #ifndef AVCODEC_MIPS_H264DSP_MIPS_H #define AVCODEC_MIPS_H264DSP_MIPS_H -#include "libavcodec/h264.h" +#include "libavcodec/h264dec.h" #include "constants.h" void ff_h264_h_lpf_luma_inter_msa(uint8_t *src, int stride, |