mirror of https://code.videolan.org/videolan/vlc
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:
parent
46130b4f41
commit
4913808e80
|
@ -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_SOURCES = hw/vdpau/avcodec.c hw/vdpau/picture.c
|
||||||
libvdpau_avcodec_plugin_la_CFLAGS = $(AM_CFLAGS) \
|
libvdpau_avcodec_plugin_la_CFLAGS = $(AM_CFLAGS) \
|
||||||
$(X_CFLAGS) $(AVCODEC_CFLAGS) $(VDPAU_CFLAGS)
|
$(AVCODEC_CFLAGS) $(VDPAU_CFLAGS)
|
||||||
libvdpau_avcodec_plugin_la_LIBADD = libvlc_vdpau.la \
|
libvdpau_avcodec_plugin_la_LIBADD = libvlc_vdpau.la $(AVCODEC_LIBS)
|
||||||
$(X_LIBS) $(X_PRE_LIBS) -lX11 $(AVCODEC_LIBS)
|
|
||||||
|
|
||||||
libvdpau_deinterlace_plugin_la_SOURCES = hw/vdpau/deinterlace.c hw/vdpau/picture.c
|
libvdpau_deinterlace_plugin_la_SOURCES = hw/vdpau/deinterlace.c hw/vdpau/picture.c
|
||||||
libvdpau_deinterlace_plugin_la_CFLAGS = $(AM_CFLAGS) $(VDPAU_CFLAGS)
|
libvdpau_deinterlace_plugin_la_CFLAGS = $(AM_CFLAGS) $(VDPAU_CFLAGS)
|
||||||
|
|
|
@ -36,7 +36,6 @@
|
||||||
#include <vlc_fourcc.h>
|
#include <vlc_fourcc.h>
|
||||||
#include <vlc_picture.h>
|
#include <vlc_picture.h>
|
||||||
#include <vlc_codec.h>
|
#include <vlc_codec.h>
|
||||||
#include <vlc_xlib.h>
|
|
||||||
#include "vlc_vdpau.h"
|
#include "vlc_vdpau.h"
|
||||||
#include "../../codec/avcodec/va.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;
|
return VLC_EGENERIC;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!vlc_xlib_init(VLC_OBJECT(va)))
|
|
||||||
{
|
|
||||||
msg_Err(va, "Xlib is required for VDPAU");
|
|
||||||
return VLC_EGENERIC;
|
|
||||||
}
|
|
||||||
|
|
||||||
unsigned codec_refs;
|
unsigned codec_refs;
|
||||||
switch (avctx->codec_id)
|
switch (avctx->codec_id)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue