diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 05:19:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 05:19:46 +0200 |
| commit | fcca7671e29b67812d29af710ff90486944ee428 (patch) | |
| tree | 8b67f16bdcbb9f1d2de5c35a527271c36ad2a25f /libavcodec/Makefile | |
| parent | f1db984288f21a1ecdff0b5702630456c089ce36 (diff) | |
| parent | e6fb844f7b736e72da364032d251283bce9e63ad (diff) | |
Merge commit 'e6fb844f7b736e72da364032d251283bce9e63ad'
* commit 'e6fb844f7b736e72da364032d251283bce9e63ad':
Implement shared parsing of INFO tag in Canopus family
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 4dde9e8828..d20982673b 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -189,7 +189,7 @@ OBJS-$(CONFIG_CINEPAK_DECODER) += cinepak.o OBJS-$(CONFIG_CINEPAK_ENCODER) += cinepakenc.o elbg.o OBJS-$(CONFIG_CLJR_DECODER) += cljrdec.o OBJS-$(CONFIG_CLJR_ENCODER) += cljrenc.o -OBJS-$(CONFIG_CLLC_DECODER) += cllc.o +OBJS-$(CONFIG_CLLC_DECODER) += cllc.o canopus.o OBJS-$(CONFIG_COOK_DECODER) += cook.o OBJS-$(CONFIG_COMFORTNOISE_DECODER) += cngdec.o celp_filters.o OBJS-$(CONFIG_COMFORTNOISE_ENCODER) += cngenc.o @@ -279,7 +279,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 hqxdsp.o +OBJS-$(CONFIG_HQX_DECODER) += hqx.o hqxvlc.o hqxdsp.o canopus.o OBJS-$(CONFIG_HUFFYUV_DECODER) += huffyuv.o huffyuvdec.o OBJS-$(CONFIG_HUFFYUV_ENCODER) += huffyuv.o huffyuvenc.o OBJS-$(CONFIG_IDCIN_DECODER) += idcinvideo.o |