[vlc-commits] vdpau/avcodec: fix build for older ffmpeg

Tristan Matthews git at videolan.org
Tue Feb 18 06:48:54 CET 2014


vlc | branch: master | Tristan Matthews <le.businessman at gmail.com> | Wed Feb  5 16:51:28 2014 -0500| [a49ee406b24b8455fcf4bcd883d7ad6b6bd0745f] | committer: Rafaël Carré

vdpau/avcodec: fix build for older ffmpeg

Signed-off-by: Rafaël Carré <funman at videolan.org>

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

 modules/hw/vdpau/avcodec.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/hw/vdpau/avcodec.c b/modules/hw/vdpau/avcodec.c
index 7081dee..a6eab23 100644
--- a/modules/hw/vdpau/avcodec.c
+++ b/modules/hw/vdpau/avcodec.c
@@ -37,6 +37,7 @@
 #include <vlc_xlib.h>
 #include "vlc_vdpau.h"
 #include "../../codec/avcodec/va.h"
+#include "../../codec/avcodec/avcommon_compat.h"
 
 static int Open(vlc_va_t *, int, const es_format_t *);
 static void Close(vlc_va_t *);
@@ -279,7 +280,7 @@ static int Open(vlc_va_t *va, int codec, const es_format_t *fmt)
     if (unlikely(sys == NULL))
        return VLC_ENOMEM;
 
-#if (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 26, 0))
+#if LIBAVCODEC_VERSION_CHECK(55, 26, 0, 42, 100)
     sys->context = av_vdpau_alloc_context();
 #else
     sys->context = calloc(1, sizeof (*sys->context));



More information about the vlc-commits mailing list