diff options
| author | erankor <eran.kornblau@kaltura.com> | 2015-12-07 12:01:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-12-15 14:16:28 +0100 |
| commit | 4469e8ebb2f370794c88aa51d528d1d899d29ddc (patch) | |
| tree | a8507e8eb328c0aee020809be37941bd37882844 /libavformat/Makefile | |
| parent | 23ac99dc17b0c4ff43bb56c1f8cbe7feb34bada5 (diff) | |
| download | ffmpeg-4469e8ebb2f370794c88aa51d528d1d899d29ddc.tar.gz | |
movenc: support cenc (common encryption)
support writing encrypted mp4 using aes-ctr, conforming to ISO/IEC
23001-7.
3 new parameters were added:
- encryption_scheme - allowed values are none (default) and cenc-aes-ctr
- encryption_key - 128 bit encryption key (hex)
- encryption_kid - 128 bit encryption key identifier (hex)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
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 ddc4c3db17..110e9e3f85 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -264,7 +264,7 @@ 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 replaygain.o OBJS-$(CONFIG_MOV_MUXER) += movenc.o isom.o avc.o hevc.o \ - movenchint.o mov_chan.o rtp.o + movenchint.o mov_chan.o rtp.o movenccenc.o OBJS-$(CONFIG_MP2_MUXER) += mp3enc.o rawenc.o id3v2enc.o OBJS-$(CONFIG_MP3_DEMUXER) += mp3dec.o replaygain.o OBJS-$(CONFIG_MP3_MUXER) += mp3enc.o rawenc.o id3v2enc.o |