Merge commit '8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Aug 2014 16:33:46 +0000 (18:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Aug 2014 16:33:46 +0000 (18:33 +0200)
commitc18a3b3e8ef438c8cd18969f8d87fd7c2201cf32
tree398aa4126677aef21691a4c86cbffe6af0824abd
parentb07dc81a9e35ddd2b2ac0109ae2e97b86ff4a4a9
parent8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2
Merge commit '8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2'

* commit '8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2':
  vfwcap: Drop fallback VfW defines

Conflicts:
libavdevice/vfwcap.c

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