Merge commit '8bc52dbd'
* commit '8bc52dbd': vfwcap: Drop fallback VfW defines Conflicts: libavdevice/vfwcap.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment
* commit '8bc52dbd': vfwcap: Drop fallback VfW defines Conflicts: libavdevice/vfwcap.c Merged-by: Michael Niedermayer <michaelni@gmx.at>