OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
674b791
)
h264: Fix HWACCEL_MAX for D3D11
author
Michael Niedermayer
<michaelni@gmx.at>
Tue, 26 May 2015 06:45:42 +0000
(08:45 +0200)
committer
Martin Storsjö
<martin@martin.st>
Mon, 1 Jun 2015 08:36:30 +0000
(11:36 +0300)
Signed-off-by: Martin Storsjö <martin@martin.st>
libavcodec/h264_slice.c
patch
|
blob
|
history
diff --git
a/libavcodec/h264_slice.c
b/libavcodec/h264_slice.c
index
a63f45a
..
4561285
100644
(file)
--- a/
libavcodec/h264_slice.c
+++ b/
libavcodec/h264_slice.c
@@
-812,6
+812,7
@@
static void init_scan_tables(H264Context *h)
static enum AVPixelFormat get_pixel_format(H264Context *h)
{
#define HWACCEL_MAX (CONFIG_H264_DXVA2_HWACCEL + \
+ CONFIG_H264_D3D11VA_HWACCEL + \
CONFIG_H264_VAAPI_HWACCEL + \
(CONFIG_H264_VDA_HWACCEL * 2) + \
CONFIG_H264_VDPAU_HWACCEL)