blob: 9358f76153ca39c1212a34c26e6b17fa988700ea (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
Include correct header with correct version. Fixes build with ffmpeg-0.10.
Index: gst-ffmpeg-0.10.13_p201211/ext/ffmpeg/gstffmpegcodecmap.c
===================================================================
--- gst-ffmpeg-0.10.13_p201211.orig/ext/ffmpeg/gstffmpegcodecmap.c
+++ gst-ffmpeg-0.10.13_p201211/ext/ffmpeg/gstffmpegcodecmap.c
@@ -25,10 +25,20 @@
#include <gst/gst.h>
#ifdef HAVE_FFMPEG_UNINSTALLED
#include <avcodec.h>
-#include <channel_layout.h>>
+#include <avutil.h>
+#if (LIBAVUTIL_VERSION_INT > AV_VERSION_INT(52,6,0) || (LIBAVUTIL_VERSION_MICRO < 100 && LIBAVUTIL_VERSION_INT > AV_VERSION_INT(52,2,0)))
+#include <channel_layout.h>
+#else
+#include <audioconvert.h>
+#endif
#else
#include <libavcodec/avcodec.h>
+#include <libavutil/avutil.h>
+#if (LIBAVUTIL_VERSION_INT > AV_VERSION_INT(52,6,0) || (LIBAVUTIL_VERSION_MICRO < 100 && LIBAVUTIL_VERSION_INT > AV_VERSION_INT(52,2,0)))
#include <libavutil/channel_layout.h>
+#else
+#include <libavutil/audioconvert.h>
+#endif
#endif
#include <string.h>
|
GitWeb
