vlc/vlc-2.0 | branch: master | Jean-Baptiste Kempf <[email protected]> | Sun Feb 12 23:47:30 2012 +0100| [d814ffb835d1c89a7e018719680643bea4aff2d2] | committer: Jean-Baptiste Kempf
Avcodec: deactivate DR on cinepack Close #5872 (cherry picked from commit c7b493435fe3855e2cc4ca168756d73a62d8b85f) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=d814ffb835d1c89a7e018719680643bea4aff2d2 --- modules/codec/avcodec/video.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c index 8a85467..49f94fc 100644 --- a/modules/codec/avcodec/video.c +++ b/modules/codec/avcodec/video.c @@ -302,6 +302,7 @@ 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 && + p_sys->i_codec_id != CODEC_ID_CINEPAK && #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 */ _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
