diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 23:34:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 23:34:17 +0100 |
| commit | 38aee6408a6732b8ac86341dabf6683c08caa1c1 (patch) | |
| tree | 90fa9045b65094f6c450b609e04b7cc6bfa9bf57 /libavformat/Makefile | |
| parent | 88c8e4afeaf74ee58b67145e0331e229d8050968 (diff) | |
| parent | a823d0948683bd97dd58556b5740e434166209a8 (diff) | |
Merge commit 'a823d0948683bd97dd58556b5740e434166209a8'
* commit 'a823d0948683bd97dd58556b5740e434166209a8':
matroskaenc: write private data in hvcC format for HEVC.
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 d3cf8efdda..fa8a9b57ed 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -203,7 +203,7 @@ OBJS-$(CONFIG_M4V_MUXER) += rawenc.o OBJS-$(CONFIG_MATROSKA_DEMUXER) += matroskadec.o matroska.o \ isom.o rmsipr.o OBJS-$(CONFIG_MATROSKA_MUXER) += matroskaenc.o matroska.o \ - isom.o avc.o \ + isom.o avc.o hevc.o \ flacenc_header.o avlanguage.o wv.o OBJS-$(CONFIG_MD5_MUXER) += md5enc.o OBJS-$(CONFIG_MGSTS_DEMUXER) += mgsts.o |