Merge commit '4f373a5111f900af54301907132942f95276285c'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 10 Apr 2015 23:35:16 +0000 (01:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 11 Apr 2015 00:19:32 +0000 (02:19 +0200)
commitd4a6c9404601ccf0b035477699fa2a9b9b1f515a
tree0e6c6b67bd824334ebbf537ed47636fc726461ce
parent9fc45681e0c4736e4475966a70402d22c76a2965
parent4f373a5111f900af54301907132942f95276285c
Merge commit '4f373a5111f900af54301907132942f95276285c'

* commit '4f373a5111f900af54301907132942f95276285c':
  vfwcap: Unbreak building after c201069fa

Conflicts:
libavdevice/vfwcap.c

See: 4d0f6d3fb421b3ab774ccd3c299f0a242f359a75
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavdevice/vfwcap.c