[FFmpeg-cvslog] asf: export encryption information from asf.
Michael Niedermayer
git at videolan.org
Sun Oct 16 05:15:41 CEST 2011
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Oct 16 04:41:11 2011 +0200| [410c06d2f3e397069307f35e4c12e19ac47f4b6d] | committer: Michael Niedermayer
asf: export encryption information from asf.
This way user apps can choose to skip such content.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=410c06d2f3e397069307f35e4c12e19ac47f4b6d
---
libavformat/asfdec.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index e09b700..8108102 100644
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
@@ -637,8 +637,10 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap)
if (!s->keylen) {
if (!ff_guidcmp(&g, &ff_asf_content_encryption)) {
av_log(s, AV_LOG_WARNING, "DRM protected stream detected, decoding will likely fail!\n");
+ av_dict_set(&s->metadata, "encryption", "ASF Content Encryption", 0);
} else if (!ff_guidcmp(&g, &ff_asf_ext_content_encryption)) {
av_log(s, AV_LOG_WARNING, "Ext DRM protected stream detected, decoding will likely fail!\n");
+ av_dict_set(&s->metadata, "encryption", "ASF Extended Content Encryption", 0);
} else if (!ff_guidcmp(&g, &ff_asf_digital_signature)) {
av_log(s, AV_LOG_WARNING, "Digital signature detected, decoding will likely fail!\n");
}
More information about the ffmpeg-cvslog
mailing list