diff options
| author | Petri Hintukainen <phintuka@users.sourceforge.net> | 2013-04-15 21:58:49 +0300 |
|---|---|---|
| committer | Petri Hintukainen <phintuka@users.sourceforge.net> | 2013-04-15 21:58:49 +0300 |
| commit | 9e8c4c69c1ffdcb0e4a6384e787c097b43f52715 (patch) | |
| tree | 7be709e1f2fd4acfb801ec1b8e8e951178fed6ff /src/video_out/video_out_vaapi.c | |
| parent | 76be1a6f1a9dddd520b5aa2b26fec403fcaa779d (diff) | |
| download | xine-lib-9e8c4c69c1ffdcb0e4a6384e787c097b43f52715.tar.gz xine-lib-9e8c4c69c1ffdcb0e4a6384e787c097b43f52715.tar.bz2 | |
video_out_vaapi: fix compilation with recent ffmpeg
Diffstat (limited to 'src/video_out/video_out_vaapi.c')
| -rw-r--r-- | src/video_out/video_out_vaapi.c | 4 |
1 files changed, 4 insertions, 0 deletions
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}, |