diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 00:19:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 00:19:41 +0200 |
| commit | 738272826f4b3b060dfe2855df5ce11865df1ec7 (patch) | |
| tree | 0b01d176c8afb03b5e1c6df1620e1e76706dbb21 /libavformat/Makefile | |
| parent | 2ca4802601c2c413af38cf2d870b03d63dbcf9b2 (diff) | |
| parent | 03391b5432a2b8b8dbc3d2db722a54dfb68737b9 (diff) | |
| download | ffmpeg-738272826f4b3b060dfe2855df5ce11865df1ec7.tar.gz | |
Merge commit '03391b5432a2b8b8dbc3d2db722a54dfb68737b9'
* commit '03391b5432a2b8b8dbc3d2db722a54dfb68737b9':
build: Add missing object files for Matroska demuxer
Conflicts:
libavcodec/Makefile
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/Makefile')
| -rw-r--r-- | libavformat/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 855b81d8c0..520b390270 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -209,7 +209,7 @@ OBJS-$(CONFIG_M4V_MUXER) += rawenc.o OBJS-$(CONFIG_MATROSKA_DEMUXER) += matroskadec.o matroska.o \ isom.o rmsipr.o flac_picture.o \ oggparsevorbis.o vorbiscomment.o \ - replaygain.o + flac_picture.o replaygain.o OBJS-$(CONFIG_MATROSKA_MUXER) += matroskaenc.o matroska.o \ isom.o avc.o hevc.o \ flacenc_header.o avlanguage.o vorbiscomment.o wv.o |