har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/matroskadec: Include webm_dash_manifest demuxer only if enabled

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2021-08-20 09:31:34 +02:00
parent 750631b098
commit 201b8a4d67
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libavformat/matroskadec.c
View File

@ -3885,6 +3885,7 @@ static int matroska_read_close(AVFormatContext *s)
return 0; return 0;
} }
#if CONFIG_WEBM_DASH_MANIFEST_DEMUXER
typedef struct { typedef struct {
int64_t start_time_ns; int64_t start_time_ns;
int64_t end_time_ns; int64_t end_time_ns;
@ -4292,6 +4293,18 @@ static const AVClass webm_dash_class = {
.version = LIBAVUTIL_VERSION_INT, .version = LIBAVUTIL_VERSION_INT,
}; };
const AVInputFormat ff_webm_dash_manifest_demuxer = {
.name = "webm_dash_manifest",
.long_name = NULL_IF_CONFIG_SMALL("WebM DASH Manifest"),
.priv_class = &webm_dash_class,
.priv_data_size = sizeof(MatroskaDemuxContext),
.flags_internal = FF_FMT_INIT_CLEANUP,
.read_header = webm_dash_manifest_read_header,
.read_packet = webm_dash_manifest_read_packet,
.read_close = matroska_read_close,
};
#endif
const AVInputFormat ff_matroska_demuxer = { const AVInputFormat ff_matroska_demuxer = {
.name = "matroska,webm", .name = "matroska,webm",
.long_name = NULL_IF_CONFIG_SMALL("Matroska / WebM"), .long_name = NULL_IF_CONFIG_SMALL("Matroska / WebM"),
@ -4305,14 +4318,3 @@ const AVInputFormat ff_matroska_demuxer = {
.read_seek = matroska_read_seek, .read_seek = matroska_read_seek,
.mime_type = "audio/webm,audio/x-matroska,video/webm,video/x-matroska" .mime_type = "audio/webm,audio/x-matroska,video/webm,video/x-matroska"
}; };
const AVInputFormat ff_webm_dash_manifest_demuxer = {
.name = "webm_dash_manifest",
.long_name = NULL_IF_CONFIG_SMALL("WebM DASH Manifest"),
.priv_data_size = sizeof(MatroskaDemuxContext),
.flags_internal = FF_FMT_INIT_CLEANUP,
.read_header = webm_dash_manifest_read_header,
.read_packet = webm_dash_manifest_read_packet,
.read_close = matroska_read_close,
.priv_class = &webm_dash_class,
};