diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2016-06-25 02:25:44 +0200 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2016-06-25 02:25:44 +0200 |
| commit | ad56f2c46ac6deec86870ec10f2a11a644df07d4 (patch) | |
| tree | 89f2d90c5586560911e67c872b530c77f151168d /video/dxva2.h | |
| parent | 0536841647ef7931bffb4386d8ffbb5b2b568e8a (diff) | |
| parent | 393bb2a565dc1e27812e1dd20747814892f80da2 (diff) | |
| download | mpv-ad56f2c46ac6deec86870ec10f2a11a644df07d4.tar.bz2 mpv-ad56f2c46ac6deec86870ec10f2a11a644df07d4.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'video/dxva2.h')
| -rw-r--r-- | video/dxva2.h | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/video/dxva2.h b/video/dxva2.h deleted file mode 100644 index 1f2e4a4071..0000000000 --- a/video/dxva2.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * This file is part of mpv. - * - * mpv 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. - * - * mpv 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 mpv. If not, see <http://www.gnu.org/licenses/>. - */ - -#ifndef MPV_DXVA2_H -#define MPV_DXVA2_H - -#include <d3d9.h> -#include <dxva2api.h> - -struct mp_image; -struct mp_image_pool; - -IDirect3DSurface9 *d3d9_surface_in_mp_image(struct mp_image *mpi); - -struct mp_image *dxva2_new_ref(IDirectXVideoDecoder *decoder, - IDirect3DSurface9 *d3d9_surface, int w, int h); - -#endif |