[vlc-commits] commit: Fix compilation ( Rémi Denis-Courmont )

git at videolan.org git at videolan.org
Sun Jul 11 11:19:39 CEST 2010


vlc/vlc-1.1 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Jul 10 17:25:41 2010 +0300| [1446dc4afd921629f45d6e547cb4eabe6d7ffcd0] | committer: Rémi Denis-Courmont 

Fix compilation

(cherry picked from commit 57bc01b040818f1b5251f08f1d8b8f527c6d2306)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=1446dc4afd921629f45d6e547cb4eabe6d7ffcd0
---

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

diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index b8aed86..234cd58 100644
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -300,9 +300,11 @@ 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 &&
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 68, 2 )
         /* avcodec native vp8 decode doesn't handle EMU_EDGE flag, and I
            don't have idea howto implement fallback to libvpx decoder */
         p_sys->i_codec_id != CODEC_ID_VP8 &&
+#endif
         !p_sys->p_context->debug_mv )
     {
         /* Some codecs set pix_fmt only after the 1st frame has been decoded,



More information about the vlc-commits mailing list