[FFmpeg-cvslog] Merge commit '8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug 19 18:33:46 2014 +0200| [c18a3b3e8ef438c8cd18969f8d87fd7c2201cf32] | committer: Michael Niedermayer

Merge commit '8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2'

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

Conflicts:
	libavdevice/vfwcap.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c18a3b3e8ef438c8cd18969f8d87fd7c2201cf32
---