summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-07-06 21:07:46 +0100
committerCarl Hetherington <cth@carlh.net>2016-07-08 01:49:43 +0100
commitcba347ed8b7f3cdd5d5392c8efa857c286ae315e (patch)
tree18aa6a8a660d4f87912f3738b88db3acae24bb7f /src
parentf7d2493f8c11579bc776b5d0d54498d1834ab525 (diff)
Use strict-experimental with AVCodec to allow import of some DNxHR files.
Diffstat (limited to 'src')
-rw-r--r--src/lib/ffmpeg.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc
index 342b9a999..8c0f0798e 100644
--- 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"));