diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-23 12:03:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-23 12:19:26 +0100 |
| commit | 2cf521718d9427329b9324b00fb59caddcf42782 (patch) | |
| tree | 3802359d7d10019217a6d63c5ada55c6373a8c96 /libavcodec/Makefile | |
| parent | c0f02b220182cc7997bd6b5279881b898f52dfbf (diff) | |
| parent | 35c6ce76b107225a19eb33aea38857d2405882af (diff) | |
Merge commit '35c6ce76b107225a19eb33aea38857d2405882af'
* commit '35c6ce76b107225a19eb33aea38857d2405882af':
Canopus HQX decoder
Conflicts:
Changelog
libavcodec/avcodec.h
libavcodec/version.h
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index b8b47843f5..e10cc16cf2 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -272,6 +272,7 @@ OBJS-$(CONFIG_HEVC_DECODER) += hevc.o hevc_mvs.o hevc_ps.o hevc_sei.o hevc_cabac.o hevc_refs.o hevcpred.o \ hevcdsp.o hevc_filter.o OBJS-$(CONFIG_HNM4_VIDEO_DECODER) += hnm4video.o +OBJS-$(CONFIG_HQX_DECODER) += hqx.o hqxvlc.o OBJS-$(CONFIG_HUFFYUV_DECODER) += huffyuv.o huffyuvdec.o OBJS-$(CONFIG_HUFFYUV_ENCODER) += huffyuv.o huffyuvenc.o OBJS-$(CONFIG_IDCIN_DECODER) += idcinvideo.o |