Commit 435214a7 authored by Martin Storsjö's avatar Martin Storsjö

Add an HDS live fragmenting muxer

HDS fragments basically are FLV fragments wrapped in an ISO
media mdat atom.
Signed-off-by: 's avatarMartin Storsjö <martin@martin.st>
parent dc6ea00c
...@@ -44,6 +44,7 @@ version 10: ...@@ -44,6 +44,7 @@ version 10:
- HEVC decoder - HEVC decoder
- raw HEVC, HEVC in MOV/MP4, HEVC in Matroska, HEVC in MPEG-TS demuxing - raw HEVC, HEVC in MOV/MP4, HEVC in Matroska, HEVC in MPEG-TS demuxing
- remove avplay -vismv option, which has not worked for a long time - remove avplay -vismv option, which has not worked for a long time
- Live HDS muxer
version 9: version 9:
......
...@@ -1825,6 +1825,7 @@ dxa_demuxer_select="riffdec" ...@@ -1825,6 +1825,7 @@ dxa_demuxer_select="riffdec"
eac3_demuxer_select="ac3_parser" eac3_demuxer_select="ac3_parser"
f4v_muxer_select="mov_muxer" f4v_muxer_select="mov_muxer"
flac_demuxer_select="flac_parser" flac_demuxer_select="flac_parser"
hds_muxer_select="flv_muxer"
hls_muxer_select="mpegts_muxer" hls_muxer_select="mpegts_muxer"
ipod_muxer_select="mov_muxer" ipod_muxer_select="mov_muxer"
ismv_muxer_select="mov_muxer" ismv_muxer_select="mov_muxer"
......
...@@ -140,6 +140,7 @@ OBJS-$(CONFIG_H263_DEMUXER) += h263dec.o rawdec.o ...@@ -140,6 +140,7 @@ OBJS-$(CONFIG_H263_DEMUXER) += h263dec.o rawdec.o
OBJS-$(CONFIG_H263_MUXER) += rawenc.o OBJS-$(CONFIG_H263_MUXER) += rawenc.o
OBJS-$(CONFIG_H264_DEMUXER) += h264dec.o rawdec.o OBJS-$(CONFIG_H264_DEMUXER) += h264dec.o rawdec.o
OBJS-$(CONFIG_H264_MUXER) += rawenc.o OBJS-$(CONFIG_H264_MUXER) += rawenc.o
OBJS-$(CONFIG_HDS_MUXER) += hdsenc.o
OBJS-$(CONFIG_HEVC_DEMUXER) += hevcdec.o rawdec.o OBJS-$(CONFIG_HEVC_DEMUXER) += hevcdec.o rawdec.o
OBJS-$(CONFIG_HLS_DEMUXER) += hls.o OBJS-$(CONFIG_HLS_DEMUXER) += hls.o
OBJS-$(CONFIG_HLS_MUXER) += hlsenc.o OBJS-$(CONFIG_HLS_MUXER) += hlsenc.o
......
...@@ -117,6 +117,7 @@ void av_register_all(void) ...@@ -117,6 +117,7 @@ void av_register_all(void)
REGISTER_MUXDEMUX(H261, h261); REGISTER_MUXDEMUX(H261, h261);
REGISTER_MUXDEMUX(H263, h263); REGISTER_MUXDEMUX(H263, h263);
REGISTER_MUXDEMUX(H264, h264); REGISTER_MUXDEMUX(H264, h264);
REGISTER_MUXER (HDS, hds);
REGISTER_DEMUXER (HEVC, hevc); REGISTER_DEMUXER (HEVC, hevc);
REGISTER_MUXDEMUX(HLS, hls); REGISTER_MUXDEMUX(HLS, hls);
REGISTER_DEMUXER (HNM, hnm); REGISTER_DEMUXER (HNM, hnm);
......
This diff is collapsed.
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
#include "libavutil/avutil.h" #include "libavutil/avutil.h"
#define LIBAVFORMAT_VERSION_MAJOR 55 #define LIBAVFORMAT_VERSION_MAJOR 55
#define LIBAVFORMAT_VERSION_MINOR 9 #define LIBAVFORMAT_VERSION_MINOR 10
#define LIBAVFORMAT_VERSION_MICRO 4 #define LIBAVFORMAT_VERSION_MICRO 0
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \ LIBAVFORMAT_VERSION_MINOR, \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment