diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 14:30:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 14:30:49 +0200 |
| commit | 9547e3eef36921f9937d7154048fd5eafe8d45fb (patch) | |
| tree | c827949a60acb27dcdc601f0e9d8fd6a449c6935 /libavformat/wv.h | |
| parent | c3b29023207850fa3b5b6b4dcb8e4940b86abb83 (diff) | |
| parent | f824535a4a79c260b59d3178b8d958217caffd78 (diff) | |
| download | ffmpeg-streaming-9547e3eef36921f9937d7154048fd5eafe8d45fb.zip ffmpeg-streaming-9547e3eef36921f9937d7154048fd5eafe8d45fb.tar.gz | |
Merge commit 'f824535a4a79c260b59d3178b8d958217caffd78'
* commit 'f824535a4a79c260b59d3178b8d958217caffd78':
vdpau: deprecate bitstream buffers within the hardware context
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/wv.h')
0 files changed, 0 insertions, 0 deletions
