Skip to content

V
vlc
Commit 0d1ba56a authored by Rafaël Carré's avatar Rafaël Carré
Browse files
Options

Revert "Disable direct-rendering on ProRes" 

This reverts commit 8b914fcd.

The problem was fixed in bc3b85c6.
parent bc3b85c6
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
modules/codec/avcodec/video.c
View file @ 0d1ba56a
...@@ -310,9 +310,6 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context, ...@@ -310,9 +310,6 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
(p_sys->p_codec->capabilities & CODEC_CAP_DR1) && (p_sys->p_codec->capabilities & CODEC_CAP_DR1) &&
/* No idea why ... but this fixes flickering on some TSCC streams */ /* 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 && 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 ) ) #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 /* avcodec native vp8 decode doesn't handle EMU_EDGE flag, and I
don't have idea howto implement fallback to libvpx decoder */ don't have idea howto implement fallback to libvpx decoder */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment