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

[Tristan Matthews]

vlc | branch: master | Tristan Matthews <le.businessman at gmail.com> | Thu Feb  6 10:58:56 2014 -0500| [47bb64f9ccf92b263cb05b8f9e96c84e1861c039] | committer: Tristan Matthews

Revert "vdpau/avcodec: fix build for older ffmpeg"

This reverts commit 4e0240788000e30f7529fded04dbc281d5a8f91f.

Rationale:
https://mailman.videolan.org/pipermail/vlc-devel/2013-April/092607.html

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

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

diff --git a/modules/hw/vdpau/avcodec.c b/modules/hw/vdpau/avcodec.c
index a6eab23..7081dee 100644
--- a/modules/hw/vdpau/avcodec.c
+++ b/modules/hw/vdpau/avcodec.c
@@ -37,7 +37,6 @@
 #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 *);
@@ -280,7 +279,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_CHECK(55, 26, 0, 42, 100)
+#if (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 26, 0))
     sys->context = av_vdpau_alloc_context();
 #else
     sys->context = calloc(1, sizeof (*sys->context));