diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-14 22:51:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-14 22:59:16 +0100 |
| commit | e33b084ee98664d8f467ea16cdf75643d167b089 (patch) | |
| tree | 41f1df94dfb74a62691599aa3903bb14151f27f8 /compat/aix | |
| parent | dfa7cb646d2093caf5a8d6025cb2845d257e040b (diff) | |
| parent | ecbcebde344c9eaeb8877ba2c5d32eb3af621e7f (diff) | |
| download | ffmpeg-e33b084ee98664d8f467ea16cdf75643d167b089.tar.gz | |
Merge commit 'ecbcebde344c9eaeb8877ba2c5d32eb3af621e7f'
* commit 'ecbcebde344c9eaeb8877ba2c5d32eb3af621e7f':
vdpau: Adjust necessary #includes for vdpau_internal.h
Conflicts:
libavcodec/vdpau_internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'compat/aix')
0 files changed, 0 insertions, 0 deletions