From 9e8c4c69c1ffdcb0e4a6384e787c097b43f52715 Mon Sep 17 00:00:00 2001
From: Petri Hintukainen <phintuka@users.sourceforge.net>
Date: Mon, 15 Apr 2013 21:58:49 +0300
Subject: video_out_vaapi: fix compilation with recent ffmpeg

---
 src/video_out/video_out_vaapi.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src')

diff --git a/src/video_out/video_out_vaapi.c b/src/video_out/video_out_vaapi.c
index 0e0dc3306..8ff02d04b 100644
--- a/src/video_out/video_out_vaapi.c
+++ b/src/video_out/video_out_vaapi.c
@@ -1134,7 +1134,11 @@ static uint32_t vaapi_get_capabilities (vo_driver_t *this_gen) {
 static const struct {
   int fmt;
   enum PixelFormat pix_fmt;
+#if defined LIBAVCODEC_VERSION_INT && LIBAVCODEC_VERSION_INT >= ((54<<16)|(25<<8))
+  enum AVCodecID codec_id;
+#else
   enum CodecID codec_id;
+#endif
 } conversion_map[] = {
   {IMGFMT_VAAPI_MPEG2,     PIX_FMT_VAAPI_VLD,  CODEC_ID_MPEG2VIDEO},
   {IMGFMT_VAAPI_MPEG2_IDCT,PIX_FMT_VAAPI_IDCT, CODEC_ID_MPEG2VIDEO},
-- 
cgit v1.2.3