[vlc-commits] Revert "Disable direct-rendering on ProRes"

[Rafaël Carré]

vlc/vlc-1.2 | branch: master | Rafaël Carré <funman at videolan.org> | Mon Dec 12 15:17:06 2011 -0500| [46ee9523b23298d5619f07893c36953a0cd4c5c7] | committer: Jean-Baptiste Kempf

Revert "Disable direct-rendering on ProRes"

This reverts commit 8b914fcd30153d05b04921868166e5bd43370d61.

The problem was fixed in bc3b85c6bd6dc0094562561b084dcea3f0364743.
(cherry picked from commit 0d1ba56a9adabefa36dab7a107a708dec5c459da)

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

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

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

diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index db27dcd..6c9b865 100644
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -302,9 +302,6 @@ 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 */