videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

vdpau: don't initialise Xlib twice 

By the time we got to this piece of code, this had already been taken
care of by the decoder device.
This commit is contained in:
Rémi Denis-Courmont 2022-01-12 17:53:45 +02:00 committed by Hugo Beauzée-Luyssen
parent 46130b4f41
commit 4913808e80
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/hw/vdpau/Makefile.am
View File

@ -15,9 +15,8 @@ libvdpau_instance_plugin_la_LIBADD = libvlc_vdpau.la \
libvdpau_avcodec_plugin_la_SOURCES = hw/vdpau/avcodec.c hw/vdpau/picture.c
libvdpau_avcodec_plugin_la_CFLAGS = $(AM_CFLAGS) \
$(X_CFLAGS) $(AVCODEC_CFLAGS) $(VDPAU_CFLAGS)
libvdpau_avcodec_plugin_la_LIBADD = libvlc_vdpau.la \
$(X_LIBS) $(X_PRE_LIBS) -lX11 $(AVCODEC_LIBS)
$(AVCODEC_CFLAGS) $(VDPAU_CFLAGS)
libvdpau_avcodec_plugin_la_LIBADD = libvlc_vdpau.la $(AVCODEC_LIBS)
libvdpau_deinterlace_plugin_la_SOURCES = hw/vdpau/deinterlace.c hw/vdpau/picture.c
libvdpau_deinterlace_plugin_la_CFLAGS = $(AM_CFLAGS) $(VDPAU_CFLAGS)

7
modules/hw/vdpau/avcodec.c
View File

@ -36,7 +36,6 @@
#include <vlc_fourcc.h>
#include <vlc_picture.h>
#include <vlc_codec.h>
#include <vlc_xlib.h>
#include "vlc_vdpau.h"
#include "../../codec/avcodec/va.h"
@ -169,12 +168,6 @@ static int Open(vlc_va_t *va, AVCodecContext *avctx, enum AVPixelFormat hwfmt, c
return VLC_EGENERIC;
}
if (!vlc_xlib_init(VLC_OBJECT(va)))
{
msg_Err(va, "Xlib is required for VDPAU");
return VLC_EGENERIC;
}
unsigned codec_refs;
switch (avctx->codec_id)
{