diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-12 13:40:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-12 13:47:37 +0200 |
| commit | 0da0caa9a9ea1a2d7471f51a11fd90c08fbcd3fb (patch) | |
| tree | 61ca4fcc5ea644dd4099a41b5efb5a9a1de99472 /libavdevice/caca.c | |
| parent | e9348e107bafcf0106c52f582d70fa53716b4ac4 (diff) | |
| parent | c0d973c41b4568d5bad1295879e35cfa611bdcf2 (diff) | |
| download | ffmpeg-0da0caa9a9ea1a2d7471f51a11fd90c08fbcd3fb.tar.gz | |
Merge commit 'c0d973c41b4568d5bad1295879e35cfa611bdcf2'
* commit 'c0d973c41b4568d5bad1295879e35cfa611bdcf2':
vdpau: use the correct namespace for the union
Conflicts:
libavcodec/vdpau.h
See: 68dfe530e0fb03b4d21dfe37f8a572b95c68485e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/caca.c')
0 files changed, 0 insertions, 0 deletions