vlc | branch: master | Steve Lhomme <rob...@videolabs.io> | Tue Apr 28 14:22:58 2015 +0200| [96c37b6abe6109a786488c6cd20aac93c399e405] | committer: Jean-Baptiste Kempf
FourCC: add D3D9 opaque GPU surface Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=96c37b6abe6109a786488c6cd20aac93c399e405 --- include/vlc_fourcc.h | 3 +++ src/misc/fourcc.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h index 5d30ece..df82f6f 100644 --- a/include/vlc_fourcc.h +++ b/include/vlc_fourcc.h @@ -332,6 +332,9 @@ /* Broadcom MMAL opaque buffer type */ #define VLC_CODEC_MMAL_OPAQUE VLC_FOURCC('M','M','A','L') +/* DXVA2 opaque video surface for use with D3D9 */ +#define VLC_CODEC_D3D9_OPAQUE VLC_FOURCC('D','X','A','9') + /* Image codec (video) */ #define VLC_CODEC_PNG VLC_FOURCC('p','n','g',' ') #define VLC_CODEC_PPM VLC_FOURCC('p','p','m',' ') diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c index 3b5c9b3..108b860 100644 --- a/src/misc/fourcc.c +++ b/src/misc/fourcc.c @@ -2190,7 +2190,7 @@ static const struct { { VLC_CODEC_VDPAU_VIDEO_420, VLC_CODEC_VDPAU_VIDEO_422, VLC_CODEC_VDPAU_VIDEO_444, VLC_CODEC_VDPAU_OUTPUT }, FAKE_FMT() }, - { { VLC_CODEC_ANDROID_OPAQUE, VLC_CODEC_MMAL_OPAQUE, }, + { { VLC_CODEC_ANDROID_OPAQUE, VLC_CODEC_MMAL_OPAQUE, VLC_CODEC_D3D9_OPAQUE, }, FAKE_FMT() }, { { 0 }, FAKE_FMT() } _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits