diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-23 16:48:41 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-23 16:48:41 +0100 |
| commit | 038e6aef7a54577a3bba6666cff21f5f4e3b2d0b (patch) | |
| tree | aa6c995c63df15efca280358172a77326700d886 /libavcodec/Makefile | |
| parent | 590fb5291ad434889b445e8b8d949daed97db5dd (diff) | |
| parent | 4abe3b049d987420eb891f74a35af2cebbf52144 (diff) | |
| download | ffmpeg-038e6aef7a54577a3bba6666cff21f5f4e3b2d0b.tar.gz | |
Merge commit '4abe3b049d987420eb891f74a35af2cebbf52144'
* commit '4abe3b049d987420eb891f74a35af2cebbf52144':
hevc: rename hevc.[ch] to hevcdec.[ch]
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index b8d7a005ea..3889ced234 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -334,7 +334,7 @@ OBJS-$(CONFIG_H264_VAAPI_ENCODER) += vaapi_encode_h264.o vaapi_encode_h26x. OBJS-$(CONFIG_H264_VIDEOTOOLBOX_ENCODER) += videotoolboxenc.o OBJS-$(CONFIG_HAP_DECODER) += hapdec.o hap.o OBJS-$(CONFIG_HAP_ENCODER) += hapenc.o hap.o -OBJS-$(CONFIG_HEVC_DECODER) += hevc.o hevc_mvs.o hevc_ps.o hevc_sei.o \ +OBJS-$(CONFIG_HEVC_DECODER) += hevcdec.o hevc_mvs.o hevc_ps.o hevc_sei.o \ hevc_cabac.o hevc_refs.o hevcpred.o \ hevcdsp.o hevc_filter.o h2645_parse.o hevc_data.o OBJS-$(CONFIG_HEVC_CUVID_DECODER) += cuvid.o |