Soft Works: > > >> -----Original Message----- >> From: ffmpeg-devel <ffmpeg-devel-boun...@ffmpeg.org> On Behalf Of >> Andreas Rheinhardt >> Sent: Saturday, May 7, 2022 1:59 PM >> To: ffmpeg-devel@ffmpeg.org >> Cc: Andreas Rheinhardt <andreas.rheinha...@outlook.com> >> Subject: [FFmpeg-devel] [PATCH v2 37/44] avformat/asf: Move ASF GUIDs >> to a new file >> >> They are also needed by the MMSH and MMST protocols and therefore >> the file they are in is pulled in when these protocols are enabled >> and used. By moving them to a separate file, linking statically to >> libavformat while only using AVIO no longer pulls in all the >> muxers/demuxers (and also no longer any AVCodecs when linking >> statically to libavcodec). >> >> Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com> > > I suppose it's a coincidence that this came just 1h after I posted > the ASF patchset.. > > No problem though, I'll adapt ;-) >
There should not be any merge conflicts, as the only one of your patches touching asf.c does not touch the guids at all. - Andreas _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
