vdpau: eliminate dead code

diff --git a/modules/hw/vdpau/chroma.c b/modules/hw/vdpau/chroma.c
index cc88e6bcc4bbb653d08dccda49e9adf284983de3..c534a8151d0d043f203fdcb5149daf2d916cbd01 100644 (file)
--- a/modules/hw/vdpau/chroma.c
+++ b/modules/hw/vdpau/chroma.c
@@ -472,7 +472,6 @@ static picture_t *MixerRender(filter_t *filter, picture_t *src)
     }
 
     src = sys->import(filter, src);
-
     /* Update history and take "present" picture field */
     if (likely(src != NULL))
     {

diff --git a/modules/hw/vdpau/picture.c b/modules/hw/vdpau/picture.c
index fbbdc3ffa42dfdf2dbdbeb03b2221312ea51d053..c488a6cd620d84082f0d08976149525023b4ee2d 100644 (file)
--- a/modules/hw/vdpau/picture.c
+++ b/modules/hw/vdpau/picture.c
@@ -110,14 +110,3 @@ vlc_vdp_video_field_t *vlc_vdp_video_copy(vlc_vdp_video_field_t *fold)
     atomic_fetch_add(&frame->refs, 1);
     return fnew;
 }
-
-vlc_vdp_video_field_t *vlc_vdp_video_detach(picture_t *pic)
-{
-    vlc_vdp_video_field_t *field = pic->context;
-
-    assert(pic->format.i_chroma == VLC_CODEC_VDPAU_VIDEO_420
-        || pic->format.i_chroma == VLC_CODEC_VDPAU_VIDEO_422);
-    //assert(!picture_IsReferenced(pic));
-    pic->context = NULL;
-    return field;
-}

diff --git a/modules/hw/vdpau/vlc_vdpau.h b/modules/hw/vdpau/vlc_vdpau.h
index cf02a85da397b1876b7091e2fde7f5406246b091..829a8285e9f7b1718fc6a557c804b2a56f956fb9 100644 (file)
--- a/modules/hw/vdpau/vlc_vdpau.h
+++ b/modules/hw/vdpau/vlc_vdpau.h
@@ -275,10 +275,4 @@ VdpStatus vlc_vdp_video_attach(vdp_t *, VdpVideoSurface, picture_t *);
  * (the underlying VDPAU video surface is shared).
  */
 vlc_vdp_video_field_t *vlc_vdp_video_copy(vlc_vdp_video_field_t *);
-
-/**
- * Detaches a VDPAU video surface as context from a VLC picture.
- * @return the detached context, or NULL on error.
- */
-vlc_vdp_video_field_t *vlc_vdp_video_detach(picture_t *);
 #endif