diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-02 10:37:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-02 10:38:03 +0100 |
| commit | 641358addcffe0cca55c547316781b11e9315dbc (patch) | |
| tree | 8abcbe8639b1c14841ec9b3536a8b7fbdb83d88b /libavformat/Makefile | |
| parent | 1344c0453615a1f0141b11f5f4e3c640ee890afc (diff) | |
| parent | 435214a757fc71d1680b12d6f930254cab3935d1 (diff) | |
| download | ffmpeg-641358addcffe0cca55c547316781b11e9315dbc.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Add an HDS live fragmenting muxer
Conflicts:
Changelog
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/Makefile')
| -rw-r--r-- | libavformat/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 69544aa41f..b08ce57933 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -166,6 +166,7 @@ OBJS-$(CONFIG_H263_DEMUXER) += h263dec.o rawdec.o OBJS-$(CONFIG_H263_MUXER) += rawenc.o OBJS-$(CONFIG_H264_DEMUXER) += h264dec.o rawdec.o OBJS-$(CONFIG_H264_MUXER) += rawenc.o +OBJS-$(CONFIG_HDS_MUXER) += hdsenc.o OBJS-$(CONFIG_HEVC_DEMUXER) += hevcdec.o rawdec.o OBJS-$(CONFIG_HLS_DEMUXER) += hls.o OBJS-$(CONFIG_HLS_MUXER) += hlsenc.o |