diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-06 15:04:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-06 15:04:03 +0200 |
| commit | a61899a0f13c0b8fca26472537cf60da04347c6d (patch) | |
| tree | f0fb8d03ea22d04afcc01df1b94ad6e973b32359 /libavcodec/vdpau_internal.h | |
| parent | 067d11bf71e87d6bcc6a12eb302d6281a0d2408d (diff) | |
| parent | e3e158e81f0666b8fe66be9ce1cad63a535920e0 (diff) | |
| download | ffmpeg-a61899a0f13c0b8fca26472537cf60da04347c6d.tar.gz | |
Merge commit 'e3e158e81f0666b8fe66be9ce1cad63a535920e0'
* commit 'e3e158e81f0666b8fe66be9ce1cad63a535920e0':
vdpau: add av_vdpau_bind_context()
Conflicts:
doc/APIchanges
libavcodec/vdpau.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vdpau_internal.h')
| -rw-r--r-- | libavcodec/vdpau_internal.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/vdpau_internal.h b/libavcodec/vdpau_internal.h index 7b40865b6a..825da7dcd3 100644 --- a/libavcodec/vdpau_internal.h +++ b/libavcodec/vdpau_internal.h @@ -59,6 +59,7 @@ typedef struct VDPAUHWContext { AVVDPAUContext context; VdpDevice device; VdpGetProcAddress *get_proc_address; + char reset; } VDPAUHWContext; typedef struct VDPAUContext { |