Use strict-experimental with AVCodec to allow import of some DNxHR files.

diff --git a/ChangeLog b/ChangeLog
index 55be07de3212d01a4dbbe59b4a7e9b32da25b5ab..77a93eef21dcda8d799cc6b353e3a81e3346e31e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,8 @@
 
 2016-07-06  Carl Hetherington  <cth@carlh.net>
 
+       * Allow import of some more types of DNxHR file.
+
        * Version 2.8.19 released.
 
 2016-07-05  c.hetherington  <cth@carlh.net>

diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc
index 342b9a9990438ba39e383c710c9dd3bac7d36cb4..8c0f0798eb0742d7e1ddc388c39a451fafd437c8 100644 (file)
--- a/src/lib/ffmpeg.cc
+++ b/src/lib/ffmpeg.cc
@@ -201,12 +201,16 @@ FFmpeg::setup_decoders ()
                AVCodec* codec = avcodec_find_decoder (context->codec_id);
                if (codec) {
 
+                       AVDictionary* options = 0;
                        /* This option disables decoding of DCA frame footers in our patched version
                           of FFmpeg.  I believe these footers are of no use to us, and they can cause
                           problems when FFmpeg fails to decode them (mantis #352).
                        */
-                       AVDictionary* options = 0;
                        av_dict_set (&options, "disable_footer", "1", 0);
+                       /* This allows decoding of some DNxHR 444 and HQX files; see
+                          https://trac.ffmpeg.org/ticket/5681
+                       */
+                       av_dict_set_int (&options, "strict", FF_COMPLIANCE_EXPERIMENTAL, 0);
 
                        if (avcodec_open2 (context, codec, &options) < 0) {
                                throw DecodeError (N_("could not open decoder"));