diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-14 13:29:00 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-14 13:29:00 +0100 |
commit | 8ee7b3881bfe96981de28d6eedaf1dcb59fe3215 (patch) | |
tree | 33a4bbe392eba0869b79b69c97ca8226fa2b6b00 /RELEASE | |
parent | a601eb9543ecab09aa69a6673e553318daf7ea57 (diff) | |
parent | 44e065d56c87d6a9d0effccec5f31517f72924ec (diff) | |
download | ffmpeg-8ee7b3881bfe96981de28d6eedaf1dcb59fe3215.tar.gz |
Merge commit '44e065d56c87d6a9d0effccec5f31517f72924ec'
* commit '44e065d56c87d6a9d0effccec5f31517f72924ec':
vdpau: Add context and common helpers for hwaccel support
Conflicts:
Changelog
doc/APIchanges
libavcodec/vdpau.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'RELEASE')
0 files changed, 0 insertions, 0 deletions