diff options
| author | James Almer <jamrial@gmail.com> | 2018-03-17 17:17:25 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2018-03-17 17:20:25 -0300 |
| commit | 86c7d8df95c15625ee582254e92f0d494e7d2d9f (patch) | |
| tree | 7303e46dc57a9761c1b66a16a08dfcbcfa4c17fc | |
| parent | c51dbc2717203e60788fcb0f711a78b15c76a057 (diff) | |
| download | ffmpeg-86c7d8df95c15625ee582254e92f0d494e7d2d9f.tar.gz | |
avformat/codec2: don't include avcodec objects
They belong in avcodec.
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavcodec/Makefile | 3 | ||||
| -rw-r--r-- | libavformat/Makefile | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 0984455ec4..b15f677bdd 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -897,6 +897,9 @@ OBJS-$(CONFIG_ISO_MEDIA) += mpeg4audio.o mpegaudiodata.o OBJS-$(CONFIG_ADTS_MUXER) += mpeg4audio.o OBJS-$(CONFIG_CAF_DEMUXER) += ac3tab.o +OBJS-$(CONFIG_CODEC2_DEMUXER) += codec2utils.o +OBJS-$(CONFIG_CODEC2_MUXER) += codec2utils.o +OBJS-$(CONFIG_CODEC2RAW_DEMUXER) += codec2utils.o OBJS-$(CONFIG_DNXHD_DEMUXER) += dnxhddata.o OBJS-$(CONFIG_FITS_DEMUXER) += fits.o OBJS-$(CONFIG_FLV_DEMUXER) += mpeg4audio.o diff --git a/libavformat/Makefile b/libavformat/Makefile index e64c5b30a1..39ec68c28b 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -133,9 +133,9 @@ OBJS-$(CONFIG_CAVSVIDEO_MUXER) += rawenc.o OBJS-$(CONFIG_CDG_DEMUXER) += cdg.o OBJS-$(CONFIG_CDXL_DEMUXER) += cdxl.o OBJS-$(CONFIG_CINE_DEMUXER) += cinedec.o -OBJS-$(CONFIG_CODEC2_DEMUXER) += ../libavcodec/codec2utils.o codec2.o rawdec.o pcm.o -OBJS-$(CONFIG_CODEC2_MUXER) += ../libavcodec/codec2utils.o codec2.o rawenc.o -OBJS-$(CONFIG_CODEC2RAW_DEMUXER) += ../libavcodec/codec2utils.o codec2.o rawdec.o pcm.o +OBJS-$(CONFIG_CODEC2_DEMUXER) += codec2.o rawdec.o pcm.o +OBJS-$(CONFIG_CODEC2_MUXER) += codec2.o rawenc.o +OBJS-$(CONFIG_CODEC2RAW_DEMUXER) += codec2.o rawdec.o pcm.o OBJS-$(CONFIG_CODEC2RAW_MUXER) += rawenc.o OBJS-$(CONFIG_CONCAT_DEMUXER) += concatdec.o OBJS-$(CONFIG_CRC_MUXER) += crcenc.o |