History

hwcontext_vaapi: Fix compilation with libva versions < 1.4.0

The BufferHandle API was added in libva 1.4.0 / VAAPI 0.36.0.

Mark Thompson committed 8 years ago

Commit 92a0a6b1 parent b473e761 file · +5 −0Browse files

Unified · Split

libavutil/hwcontext_vaapi.c+5−0
@@ -1164,6 +1164,7 @@ fail: · 1163 unmodified lines
11641164 }
11651165 #endif
11661166
1167+#if VA_CHECK_VERSION(0, 36, 0)
11671168 typedef struct VAAPIDRMImageBufferMapping {
11681169 VAImage image;
11691170 VABufferInfo buffer_info;
@@ -1323,6 +1324,7 @@ fail: · 153 unmodified lines
13231324 av_freep(&mapping);
13241325 return err;
13251326 }
1327+#endif
13261328
13271329 static int vaapi_map_to_drm(AVHWFramesContext *hwfc, AVFrame *dst,
13281330 const AVFrame *src, int flags)
@@ -1333,7 +1335,10 @@ static int vaapi_map_to_drm(AVHWFramesContext *hwfc, AVFrame *dst, · 4 unmodified lines
13331335 if (err != AVERROR(ENOSYS))
13341336 return err;
13351337 #endif
1338+#if VA_CHECK_VERSION(0, 36, 0)
13361339 return vaapi_map_to_drm_abh(hwfc, dst, src, flags);
1340+#endif
1341+ return AVERROR(ENOSYS);
13371342 }
13381343
13391344 #endif /* CONFIG_LIBDRM */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t