diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-03 21:42:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-03 21:42:16 +0200 |
| commit | a9ce5d92e6148cbf9016052839159059905320ef (patch) | |
| tree | 5f9b15ba0b597f3a0b59db4cef6ce9a855c1e278 /libavformat/Makefile | |
| parent | 524eeaca228043c93d0f94ffe9c51149c0408f04 (diff) | |
| parent | 0955e57ad07640574fc20ce0bea3c0b83982ada1 (diff) | |
| download | ffmpeg-a9ce5d92e6148cbf9016052839159059905320ef.tar.gz | |
Merge commit '0955e57ad07640574fc20ce0bea3c0b83982ada1'
* commit '0955e57ad07640574fc20ce0bea3c0b83982ada1':
daud: split muxer and demuxer
Conflicts:
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/Makefile')
| -rw-r--r-- | libavformat/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index b42c823fe9..7e7a7fbaa5 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -111,8 +111,8 @@ OBJS-$(CONFIG_CONCAT_DEMUXER) += concatdec.o OBJS-$(CONFIG_CRC_MUXER) += crcenc.o OBJS-$(CONFIG_DATA_DEMUXER) += rawdec.o OBJS-$(CONFIG_DATA_MUXER) += rawdec.o -OBJS-$(CONFIG_DAUD_DEMUXER) += daud.o -OBJS-$(CONFIG_DAUD_MUXER) += daud.o +OBJS-$(CONFIG_DAUD_DEMUXER) += dauddec.o +OBJS-$(CONFIG_DAUD_MUXER) += daudenc.o OBJS-$(CONFIG_DFA_DEMUXER) += dfa.o OBJS-$(CONFIG_DIRAC_DEMUXER) += diracdec.o rawdec.o OBJS-$(CONFIG_DIRAC_MUXER) += rawenc.o |