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
1164}1164}
1165#endif1165#endif
1166 1166
1167#if VA_CHECK_VERSION(0, 36, 0)
1167typedef struct VAAPIDRMImageBufferMapping {1168typedef struct VAAPIDRMImageBufferMapping {
1168 VAImage image;1169 VAImage image;
1169 VABufferInfo buffer_info;1170 VABufferInfo buffer_info;
@@ -1323,6 +1324,7 @@ fail: · 153 unmodified lines
1323 av_freep(&mapping);1324 av_freep(&mapping);
1324 return err;1325 return err;
1325}1326}
1327#endif
1326 1328
1327static int vaapi_map_to_drm(AVHWFramesContext *hwfc, AVFrame *dst,1329static int vaapi_map_to_drm(AVHWFramesContext *hwfc, AVFrame *dst,
1328 const AVFrame *src, int flags)1330 const AVFrame *src, int flags)
@@ -1333,7 +1335,10 @@ static int vaapi_map_to_drm(AVHWFramesContext *hwfc, AVFrame *dst, · 4 unmodified lines
1333 if (err != AVERROR(ENOSYS))1335 if (err != AVERROR(ENOSYS))
1334 return err;1336 return err;
1335#endif1337#endif
1338#if VA_CHECK_VERSION(0, 36, 0)
1336 return vaapi_map_to_drm_abh(hwfc, dst, src, flags);1339 return vaapi_map_to_drm_abh(hwfc, dst, src, flags);
1340#endif
1341 return AVERROR(ENOSYS);
1337}1342}
1338 1343
1339#endif /* CONFIG_LIBDRM */1344#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