ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-20 05:16:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

avformat/Makefile: Remove false dependencies of WebM and Matroska muxer

Browse Source 
These muxers don't depend on the WebM Chunk or the WebM DASH Manifest
muxers.

Furthermore, remove some #if checks in webm_chunk.c and webmdashenc.c.
They are always true now that webm_chunk.c and webmdashenc.c are only
compiled when their corresponding muxers are enabled.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-04-07 22:14:13 +02:00
parent a51d1b3634
commit 0c0a1d73c2
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/Makefile
View File

@ -300,8 +300,8 @@ OBJS-$(CONFIG_MATROSKA_DEMUXER) += matroskadec.o matroska.o \
flac_picture.o replaygain.o
OBJS-$(CONFIG_MATROSKA_MUXER) += matroskaenc.o matroska.o \
av1.o avc.o hevc.o \
flacenc_header.o avlanguage.o vorbiscomment.o wv.o \
webmdashenc.o webm_chunk.o
flacenc_header.o avlanguage.o \
vorbiscomment.o wv.o
OBJS-$(CONFIG_MD5_MUXER) += hashenc.o
OBJS-$(CONFIG_MGSTS_DEMUXER) += mgsts.o
OBJS-$(CONFIG_MICRODVD_DEMUXER) += microdvddec.o subtitles.o
@ -552,8 +552,7 @@ OBJS-$(CONFIG_WC3_DEMUXER) += wc3movie.o
OBJS-$(CONFIG_WEBM_MUXER) += matroskaenc.o matroska.o \
av1.o avc.o hevc.o \
flacenc_header.o avlanguage.o \
wv.o vorbiscomment.o \
webmdashenc.o webm_chunk.o
wv.o vorbiscomment.o
OBJS-$(CONFIG_WEBM_DASH_MANIFEST_MUXER) += webmdashenc.o
OBJS-$(CONFIG_WEBM_CHUNK_MUXER) += webm_chunk.o
OBJS-$(CONFIG_WEBP_MUXER) += webpenc.o

2
libavformat/webm_chunk.c
View File

@ -284,7 +284,6 @@ static const AVOption options[] = {
{ NULL },
};
#if CONFIG_WEBM_CHUNK_MUXER
static const AVClass webm_chunk_class = {
.class_name = "WebM Chunk Muxer",
.item_name = av_default_item_name,
@ -307,4 +306,3 @@ AVOutputFormat ff_webm_chunk_muxer = {
.deinit = webm_chunk_deinit,
.priv_class = &webm_chunk_class,
};
#endif

2
libavformat/webmdashenc.c
View File

@ -559,7 +559,6 @@ static const AVOption options[] = {
{ NULL },
};
#if CONFIG_WEBM_DASH_MANIFEST_MUXER
static const AVClass webm_dash_class = {
.class_name = "WebM DASH Manifest muxer",
.item_name = av_default_item_name,
@ -577,4 +576,3 @@ AVOutputFormat ff_webm_dash_manifest_muxer = {
.write_packet = webm_dash_manifest_write_packet,
.priv_class = &webm_dash_class,
};
#endif