diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 15:45:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 16:18:21 +0100 |
| commit | 8cf9253aef19e0ef4523be253a8fa8853179cfb0 (patch) | |
| tree | 9edbec06e1651dd918fc1c10c55b3e82e9bfb293 /ffserver.c | |
| parent | 60cc4a32b52fef453d03b3c60e1d661e3fad9c05 (diff) | |
| parent | 82ca17ac7a0a08784cb6808384ee237ac28e8334 (diff) | |
| download | ffmpeg-8cf9253aef19e0ef4523be253a8fa8853179cfb0.tar.gz | |
Merge commit '82ca17ac7a0a08784cb6808384ee237ac28e8334'
* commit '82ca17ac7a0a08784cb6808384ee237ac28e8334':
configure: Fix vaapi/vda/vdpau dependency declarations
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
0 files changed, 0 insertions, 0 deletions