[vlc-commits] dxva: remove unused va_surface.h

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Tue Oct  8 14:48:14 2019 +0200| [fd37d38eb21c870d54903a73ccec4d938293e6a0] | committer: Steve Lhomme

dxva: remove unused va_surface.h

Only va_surface_internal.h remains

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fd37d38eb21c870d54903a73ccec4d938293e6a0
---

 modules/codec/Makefile.am          |  4 ++--
 modules/codec/avcodec/va_surface.h | 45 --------------------------------------
 2 files changed, 2 insertions(+), 47 deletions(-)

diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
index e77725014c..eaaa79f08b 100644
--- a/modules/codec/Makefile.am
+++ b/modules/codec/Makefile.am
@@ -407,7 +407,7 @@ endif
 
 libdxva2_plugin_la_SOURCES = \
 	codec/avcodec/dxva2.c codec/avcodec/directx_va.c codec/avcodec/directx_va.h \
-	codec/avcodec/va_surface.c codec/avcodec/va_surface.h codec/avcodec/va_surface_internal.h \
+	codec/avcodec/va_surface.c codec/avcodec/va_surface_internal.h \
 	packetizer/h264_nal.c packetizer/h264_nal.h \
 	packetizer/hevc_nal.c packetizer/hevc_nal.h \
 	codec/avcodec/dxva_blacklist.c
@@ -425,7 +425,7 @@ endif
 
 libd3d11va_plugin_la_SOURCES = \
 	codec/avcodec/d3d11va.c codec/avcodec/directx_va.c codec/avcodec/directx_va.h \
-        codec/avcodec/va_surface.c codec/avcodec/va_surface.h codec/avcodec/va_surface_internal.h \
+        codec/avcodec/va_surface.c codec/avcodec/va_surface_internal.h \
 	packetizer/h264_nal.c packetizer/h264_nal.h \
 	packetizer/hevc_nal.c packetizer/hevc_nal.h \
 	codec/avcodec/dxva_blacklist.c
diff --git a/modules/codec/avcodec/va_surface.h b/modules/codec/avcodec/va_surface.h
deleted file mode 100644
index 8ae67077ae..0000000000
--- a/modules/codec/avcodec/va_surface.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*****************************************************************************
- * va_surface.h: libavcodec Generic Video Acceleration helpers
- *****************************************************************************
- * Copyright (C) 2009 Geoffroy Couprie
- * Copyright (C) 2009 Laurent Aimar
- * Copyright (C) 2015 Steve Lhomme
- *
- * Authors: Geoffroy Couprie <geal at videolan.org>
- *          Laurent Aimar <fenrir _AT_ videolan _DOT_ org>
- *          Steve Lhomme <robux4 at gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#ifndef AVCODEC_VA_SURFACE_H
-#define AVCODEC_VA_SURFACE_H
-
-#include <vlc_picture.h>
-
-struct va_pic_context
-{
-    picture_context_t         s;
-    struct vlc_va_surface_t *va_surface;
-    VA_PICSYS                 picsys;
-};
-
-static inline VA_PICSYS *ActivePictureSys(picture_t *p_pic)
-{
-    struct va_pic_context *pic_ctx = container_of(p_pic->context, struct va_pic_context, s);
-    return p_pic->context ? &pic_ctx->picsys : p_pic->p_sys;
-}
-
-#endif /* AVCODEC_VA_SURFACE_H */