]> git.sesse.net Git - casparcg/commitdiff
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Thu, 24 Nov 2011 09:24:35 +0000 (09:24 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Thu, 24 Nov 2011 09:24:35 +0000 (09:24 +0000)
modules/ffmpeg/producer/util/util.cpp

index 727246c31608a1247ab235b264d533f3798946c3..0171d0432b03f8fb607f8b7255c8ae4dcc82a286 100644 (file)
@@ -362,6 +362,9 @@ safe_ptr<AVCodecContext> open_codec(AVFormatContext& context, enum AVMediaType t
 {      \r
        AVCodec* decoder;\r
        index = THROW_ON_ERROR2(av_find_best_stream(&context, type, -1, -1, &decoder, 0), "");\r
+       if(strcmp(decoder->name, "prores") == 0 && strcmp(decoder->next->name,"prores_lgpl") == 0)\r
+               decoder = decoder->next;\r
+\r
        THROW_ON_ERROR2(tbb_avcodec_open(context.streams[index]->codec, decoder), "");\r
        return safe_ptr<AVCodecContext>(context.streams[index]->codec, tbb_avcodec_close);\r
 }\r