diff options
author | Clément Bœsch <u@pkh.me> | 2017-04-17 14:01:31 +0200 |
---|---|---|
committer | Clément Bœsch <u@pkh.me> | 2017-04-17 14:01:57 +0200 |
commit | e22d495538c1de6a13cf8f51e7448d3312365747 (patch) | |
tree | d0681e38c64f0e745125502d478d9cb898f18c22 /libavcodec/Makefile | |
parent | b5a42c7f098a0eaee9cb08ce8b26b0c9a307d9c4 (diff) | |
parent | 47e547b321338c73c21fa623789f1efbd80a297a (diff) | |
download | ffmpeg-e22d495538c1de6a13cf8f51e7448d3312365747.tar.gz |
Merge commit '47e547b321338c73c21fa623789f1efbd80a297a'
* commit '47e547b321338c73c21fa623789f1efbd80a297a':
lavc: add a null bitstream filter
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/Makefile')
-rw-r--r-- | libavcodec/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index c7454543bb..62f9db5c86 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -993,6 +993,7 @@ OBJS-$(CONFIG_MOV2TEXTSUB_BSF) += movsub_bsf.o OBJS-$(CONFIG_MP3_HEADER_DECOMPRESS_BSF) += mp3_header_decompress_bsf.o \ mpegaudiodata.o OBJS-$(CONFIG_NOISE_BSF) += noise_bsf.o +OBJS-$(CONFIG_NULL_BSF) += null_bsf.o OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF) += remove_extradata_bsf.o OBJS-$(CONFIG_TEXT2MOVSUB_BSF) += movsub_bsf.o OBJS-$(CONFIG_VP9_SUPERFRAME_BSF) += vp9_superframe_bsf.o |