ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinha...@outlook.com> | Thu Apr 10 18:00:46 2025 +0200| [66310f8a2204dcef966b3cbfefdd5ac9c8b17240] | committer: Andreas Rheinhardt
avformat/asf_tags: Deduplicate tags Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=66310f8a2204dcef966b3cbfefdd5ac9c8b17240 --- libavformat/asf.h | 2 +- libavformat/asf_tags.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/libavformat/asf.h b/libavformat/asf.h index 01cc4f7a46..b77dabe1ff 100644 --- a/libavformat/asf.h +++ b/libavformat/asf.h @@ -98,7 +98,7 @@ extern const ff_asf_guid ff_asf_language_guid; extern const ff_asf_guid ff_asf_content_encryption; extern const ff_asf_guid ff_asf_ext_content_encryption; extern const ff_asf_guid ff_asf_digital_signature; -extern const ff_asf_guid ff_asf_extended_stream_properties_object; +#define ff_asf_extended_stream_properties_object ff_asf_ext_stream_header extern const ff_asf_guid ff_asf_group_mutual_exclusion_object; extern const ff_asf_guid ff_asf_mutex_language; diff --git a/libavformat/asf_tags.c b/libavformat/asf_tags.c index 53d886f181..240f7e4da0 100644 --- a/libavformat/asf_tags.c +++ b/libavformat/asf_tags.c @@ -137,10 +137,6 @@ const ff_asf_guid ff_asf_digital_signature = { 0xfc, 0xb3, 0x11, 0x22, 0x23, 0xbd, 0xd2, 0x11, 0xb4, 0xb7, 0x00, 0xa0, 0xc9, 0x55, 0xfc, 0x6e }; -const ff_asf_guid ff_asf_extended_stream_properties_object = { - 0xcb, 0xa5, 0xe6, 0x14, 0x72, 0xc6, 0x32, 0x43, 0x83, 0x99, 0xa9, 0x69, 0x52, 0x06, 0x5b, 0x5a -}; - const ff_asf_guid ff_asf_group_mutual_exclusion_object = { 0x40, 0x5a, 0x46, 0xd1, 0x79, 0x5a, 0x38, 0x43, 0xb7, 0x1b, 0xe3, 0x6b, 0x8f, 0xd6, 0xc2, 0x49 }; _______________________________________________ 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".
