diff options
| author | Michael Niedermayer <[email protected]> | 2013-08-06 13:54:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-08-06 13:54:05 +0200 |
| commit | 3b805dcaa97ed8ac085d6af07ba450846f8487e3 (patch) | |
| tree | 834878733839fa3895ec63819f1b583fcf4ad9c7 /libavformat/rtmpcrypt.c | |
| parent | 4ee0984341d89c657ebdd835483bbe3ea48e9c19 (diff) | |
| parent | 549294fbbe1c00fee37dc4d3f291b98945e11094 (diff) | |
Merge commit '549294fbbe1c00fee37dc4d3f291b98945e11094'
* commit '549294fbbe1c00fee37dc4d3f291b98945e11094':
vdpau: deprecate VDPAU codec capability
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/rtmpcrypt.c')
0 files changed, 0 insertions, 0 deletions