diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-11 01:35:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-11 02:19:32 +0200 |
| commit | d4a6c9404601ccf0b035477699fa2a9b9b1f515a (patch) | |
| tree | 0e6c6b67bd824334ebbf537ed47636fc726461ce /tests/ref/vsynth/vsynth1-wmv1 | |
| parent | 9fc45681e0c4736e4475966a70402d22c76a2965 (diff) | |
| parent | 4f373a5111f900af54301907132942f95276285c (diff) | |
| download | ffmpeg-d4a6c9404601ccf0b035477699fa2a9b9b1f515a.tar.gz | |
Merge commit '4f373a5111f900af54301907132942f95276285c'
* commit '4f373a5111f900af54301907132942f95276285c':
vfwcap: Unbreak building after c201069fa
Conflicts:
libavdevice/vfwcap.c
See: 4d0f6d3fb421b3ab774ccd3c299f0a242f359a75
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/vsynth/vsynth1-wmv1')
0 files changed, 0 insertions, 0 deletions