ffmpeg | branch: release/5.0 | Andreas Rheinhardt <andreas.rheinha...@outlook.com> | Thu Jan 6 19:42:05 2022 +0100| [60d6efe218c01d48ff93816a14e8e1d7ac9b0fca] | committer: Andreas Rheinhardt
avformat/matroskaenc: Fix build with only WebM muxer enabled In this case ff_isom_put_dvcc_dvvc() might not be available, leading to linking failures. Given that WebM currently doesn't support DOVI, this is fixed by #if'ing the offending code away if the Matroska muxer is not enabled. Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com> (cherry picked from commit 217c90aac70af35e34381d7a99b4407686a3f47b) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=60d6efe218c01d48ff93816a14e8e1d7ac9b0fca --- libavformat/matroskaenc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 5cc59dc9f8..6ba1dadee9 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1123,6 +1123,7 @@ static int mkv_write_stereo_mode(AVFormatContext *s, AVIOContext *pb, static void mkv_write_dovi(AVFormatContext *s, AVIOContext *pb, AVStream *st) { +#if CONFIG_MATROSKA_MUXER AVDOVIDecoderConfigurationRecord *dovi = (AVDOVIDecoderConfigurationRecord *) av_stream_get_side_data(st, AV_PKT_DATA_DOVI_CONF, NULL); @@ -1150,6 +1151,7 @@ static void mkv_write_dovi(AVFormatContext *s, AVIOContext *pb, AVStream *st) end_ebml_master(pb, mapping); } +#endif } static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
