summaryrefslogtreecommitdiff
path: root/libavcodec/vdpau_mpeg4.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2016-11-24 15:14:22 +0100
committerAnton Khirnov <anton@khirnov.net>2016-12-19 08:10:22 +0100
commitd4a91e65343be5d79a4afa61c791191e1b57499a (patch)
treeb6a191f872f3162949018d145d2d706f106fd8b9 /libavcodec/vdpau_mpeg4.c
parent8dfba25ce89b62c80ba83e2116d549176c376144 (diff)
pthread_frame: do not run hwaccel decoding asynchronously unless it's safe
Certain hardware decoding APIs are not guaranteed to be thread-safe, so having the user access decoded hardware surfaces while the decoder is running in another thread can cause failures (this is mainly known to happen with DXVA2). For such hwaccels, only allow the decoding thread to run while the user is inside a lavc decode call (avcodec_send_packet/receive_frame).
Diffstat (limited to 'libavcodec/vdpau_mpeg4.c')
-rw-r--r--libavcodec/vdpau_mpeg4.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/vdpau_mpeg4.c b/libavcodec/vdpau_mpeg4.c
index fcad42f0a4..4f3d6e5448 100644
--- a/libavcodec/vdpau_mpeg4.c
+++ b/libavcodec/vdpau_mpeg4.c
@@ -24,6 +24,7 @@
#include <vdpau/vdpau.h>
#include "avcodec.h"
+#include "hwaccel.h"
#include "mpeg4video.h"
#include "vdpau.h"
#include "vdpau_internal.h"
@@ -118,4 +119,5 @@ AVHWAccel ff_mpeg4_vdpau_hwaccel = {
.init = vdpau_mpeg4_init,
.uninit = ff_vdpau_common_uninit,
.priv_data_size = sizeof(VDPAUContext),
+ .caps_internal = HWACCEL_CAP_ASYNC_SAFE,
};