[FFmpeg-cvslog] dpx: warn if encrypted

Christophe Gisquet git at videolan.org
Thu Aug 14 04:36:54 CEST 2014


ffmpeg | branch: master | Christophe Gisquet <christophe.gisquet at gmail.com> | Wed Aug 13 01:44:40 2014 +0200| [7cdef77b50360c4294e50115fe6d0ee46fc9a9d9] | committer: Michael Niedermayer

dpx: warn if encrypted

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7cdef77b50360c4294e50115fe6d0ee46fc9a9d9
---

 libavcodec/dpx.c |   10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c
index 5f05cd8..d8fb4e0 100644
--- a/libavcodec/dpx.c
+++ b/libavcodec/dpx.c
@@ -108,6 +108,16 @@ static int decode_frame(AVCodecContext *avctx,
         av_log(avctx, AV_LOG_ERROR, "Invalid data start offset\n");
         return AVERROR_INVALIDDATA;
     }
+
+    // Check encryption
+    buf = avpkt->data + 660;
+    ret = read32(&buf, endian);
+    if (ret != 0xFFFFFFFF) {
+        avpriv_report_missing_feature(avctx, "Encryption");
+        av_log(avctx, AV_LOG_WARNING, "The image is encrypted and may "
+               "not properly decode.\n");
+    }
+
     // Need to end in 0x304 offset from start of file
     buf = avpkt->data + 0x304;
     w = read32(&buf, endian);



More information about the ffmpeg-cvslog mailing list