summaryrefslogtreecommitdiff
path: root/src/combined/ffmpeg/ffmpeg_compat.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/combined/ffmpeg/ffmpeg_compat.h')
-rw-r--r--src/combined/ffmpeg/ffmpeg_compat.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/combined/ffmpeg/ffmpeg_compat.h b/src/combined/ffmpeg/ffmpeg_compat.h
index 4d9d66bf0..bd9cd310d 100644
--- a/src/combined/ffmpeg/ffmpeg_compat.h
+++ b/src/combined/ffmpeg/ffmpeg_compat.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2014 the xine project
+ * Copyright (C) 2000-2015 the xine project
*
* This file is part of xine, a unix video player.
*
@@ -67,6 +67,11 @@
# define AVCODEC_HAS_SUB_ID
#endif
+/* not 100% sure about this (between 55.19 and 56.56) */
+#if LIBAVCODEC_VERSION_INT < AV_INT_VERSION(56,0,0)
+# define AVCODEC_HAS_STREAM_CODEC_TAG
+#endif
+
/**/
#if LIBAVCODEC_VERSION_INT >= AV_INT_VERSION(53,8,0)
# define avcodec_init() do {} while(0)