[vlc-commits] Disable direct-rendering on ProRes

[Jean-Baptiste Kempf]

vlc/vlc-1.2 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Dec 10 20:53:04 2011 +0100| [6437c80f85760f13259b119536d7114b547b8d2b] | committer: Jean-Baptiste Kempf

Disable direct-rendering on ProRes

Crashes in the SSSE3 asm
(cherry picked from commit 8b914fcd30153d05b04921868166e5bd43370d61)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=6437c80f85760f13259b119536d7114b547b8d2b
---

 modules/codec/avcodec/video.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index 6c9b865..db27dcd 100644
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -302,6 +302,9 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
        (p_sys->p_codec->capabilities & CODEC_CAP_DR1) &&
         /* No idea why ... but this fixes flickering on some TSCC streams */
         p_sys->i_codec_id != CODEC_ID_TSCC && p_sys->i_codec_id != CODEC_ID_CSCD &&
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 53, 15, 0 )
+        p_sys->i_codec_id != CODEC_ID_PRORES &&
+#endif
 #if (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 68, 2 ) ) && (LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 52, 100, 1 ) )
         /* avcodec native vp8 decode doesn't handle EMU_EDGE flag, and I
            don't have idea howto implement fallback to libvpx decoder */