diff mbox series

[FFmpeg-devel,12/12] avformat/matroskaenc: Fix build with only WebM muxer enabled

Message ID AM7PR03MB666029C582BDA508E8E7C2238F4C9@AM7PR03MB6660.eurprd03.prod.outlook.com
State Accepted
Commit 217c90aac70af35e34381d7a99b4407686a3f47b
Headers show
Series [FFmpeg-devel] avformat/Makefile: Add missing libamqp->urldecode dependency | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished

Commit Message

Andreas Rheinhardt Jan. 6, 2022, 6:47 p.m. UTC 
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.rheinhardt@outlook.com>
---
 libavformat/matroskaenc.c | 2 ++
 1 file changed, 2 insertions(+)
diff mbox series

Patch

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,