Ubuntu Pastebin

Paste from philipl at Fri, 24 Nov 2017 17:58:49 +0000

Download as text 
 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
30
31
32
33
34
35
36
37
38
39
40
commit 2e066bf141c4f8ba778566682ce9aeb1402bb304
Author: Philip Langdale <philipl@overt.org>
Date:   Fri Nov 24 09:58:22 2017 -0800

    avcodec: Fix declaration of xvmc hwaccels

diff --git a/libavcodec/hwaccel.h b/libavcodec/hwaccel.h
index 382e0d0264..8b696a5525 100644
--- a/libavcodec/hwaccel.h
+++ b/libavcodec/hwaccel.h
@@ -88,5 +88,7 @@ typedef struct AVCodecHWConfigInternal {
 
 #define HWACCEL_D3D11VA(codec) \
     HW_CONFIG_AD_HOC_HWACCEL(D3D11VA_VLD, ff_ ## codec ## _d3d11va_hwaccel)
+#define HWACCEL_XVMC(codec) \
+    HW_CONFIG_AD_HOC_HWACCEL(XVMC, ff_ ## codec ## _xvmc_hwaccel)
 
 #endif /* AVCODEC_HWACCEL_H */
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index 07c68dbabc..ac5ac4bca4 100644
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -2903,7 +2903,7 @@ AVCodec ff_mpeg1video_decoder = {
                                HWACCEL_VIDEOTOOLBOX(mpeg1),
 #endif
 #if CONFIG_MPEG1_XVMC_HWACCEL
-                               HW_CONFIG_AD_HOC_HWACCEL(XVMC, mpeg1),
+                               HWACCEL_XVMC(mpeg1),
 #endif
                                NULL
                            },
@@ -2948,7 +2948,7 @@ AVCodec ff_mpeg2video_decoder = {
                         HWACCEL_VIDEOTOOLBOX(mpeg2),
 #endif
 #if CONFIG_MPEG2_XVMC_HWACCEL
-                        HW_CONFIG_AD_HOC_HWACCEL(XVMC, mpeg2),
+                        HWACCEL_XVMC(mpeg2),
 #endif
                         NULL
                     },
Download as text