diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-30 20:39:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-30 20:39:08 +0200 |
| commit | 98263d751562e3b8cefa6d06eb95f0dee8a205db (patch) | |
| tree | 3ad247f5591a06a9967b362b7dcd0d3e6e7dc6e6 /libavcodec/Makefile | |
| parent | f5c7531ab1e69210df69b07ac6b21cb675f13b9e (diff) | |
| parent | 23944d29a22a2cd602753b3705f73011c3bf0b18 (diff) | |
| download | ffmpeg-98263d751562e3b8cefa6d06eb95f0dee8a205db.tar.gz | |
Merge commit '23944d29a22a2cd602753b3705f73011c3bf0b18'
* commit '23944d29a22a2cd602753b3705f73011c3bf0b18':
indeo: Give Indeo4/5 shared code a more consistent name
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 e73005d816..6e6285a934 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -287,8 +287,8 @@ OBJS-$(CONFIG_IFF_ILBM_DECODER) += iff.o OBJS-$(CONFIG_IMC_DECODER) += imc.o OBJS-$(CONFIG_INDEO2_DECODER) += indeo2.o OBJS-$(CONFIG_INDEO3_DECODER) += indeo3.o -OBJS-$(CONFIG_INDEO4_DECODER) += indeo4.o ivi_common.o ivi_dsp.o -OBJS-$(CONFIG_INDEO5_DECODER) += indeo5.o ivi_common.o ivi_dsp.o +OBJS-$(CONFIG_INDEO4_DECODER) += indeo4.o ivi.o ivi_dsp.o +OBJS-$(CONFIG_INDEO5_DECODER) += indeo5.o ivi.o ivi_dsp.o OBJS-$(CONFIG_INTERPLAY_DPCM_DECODER) += dpcm.o OBJS-$(CONFIG_INTERPLAY_VIDEO_DECODER) += interplayvideo.o OBJS-$(CONFIG_JACOSUB_DECODER) += jacosubdec.o ass.o |