diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 22:48:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 22:48:08 +0100 |
| commit | 1b1d77ae9b38fb257e9ae9fb565091c6b7e43181 (patch) | |
| tree | ef4875409644c61d98062cfbc10f7029adfe1e9a /libavformat/Makefile | |
| parent | ce1ad8d775ba74f2ab03675043116be3c305fcb1 (diff) | |
| parent | 20b40a597cdd4969cf1147d7c7efee2b6232524b (diff) | |
Merge commit '20b40a597cdd4969cf1147d7c7efee2b6232524b'
* commit '20b40a597cdd4969cf1147d7c7efee2b6232524b':
movenc: write hvcC tag for HEVC.
Conflicts:
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 dd13fd0167..a7ad345457 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -217,7 +217,7 @@ OBJS-$(CONFIG_MM_DEMUXER) += mm.o OBJS-$(CONFIG_MMF_DEMUXER) += mmf.o OBJS-$(CONFIG_MMF_MUXER) += mmf.o rawenc.o OBJS-$(CONFIG_MOV_DEMUXER) += mov.o isom.o mov_chan.o -OBJS-$(CONFIG_MOV_MUXER) += movenc.o isom.o avc.o \ +OBJS-$(CONFIG_MOV_MUXER) += movenc.o isom.o avc.o hevc.o \ movenchint.o mov_chan.o rtp.o OBJS-$(CONFIG_MP2_MUXER) += mp3enc.o rawenc.o id3v2enc.o OBJS-$(CONFIG_MP3_DEMUXER) += mp3dec.o |