diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 04:33:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 04:33:06 +0200 |
| commit | d8b4e9adbb93211b511e3864d8230789186ef4ed (patch) | |
| tree | 91a10cfd1479528e30f68808ac5b099de2c9262c /libavcodec/Makefile | |
| parent | 73e6af9d7b56f12d8676ff919f4acc6c9991d985 (diff) | |
| parent | ea031b75fb50c59196ccb654c9d143fb75365da9 (diff) | |
Merge commit 'ea031b75fb50c59196ccb654c9d143fb75365da9'
* commit 'ea031b75fb50c59196ccb654c9d143fb75365da9':
hqx: Move DSP related code to a separate file
Conflicts:
libavcodec/hqx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 b01ecd69b4..4dde9e8828 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -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 +OBJS-$(CONFIG_HQX_DECODER) += hqx.o hqxvlc.o hqxdsp.o OBJS-$(CONFIG_HUFFYUV_DECODER) += huffyuv.o huffyuvdec.o OBJS-$(CONFIG_HUFFYUV_ENCODER) += huffyuv.o huffyuvenc.o OBJS-$(CONFIG_IDCIN_DECODER) += idcinvideo.o |