[FFmpeg-cvslog] Merge commit 'c201069fac9a76e6604f9d84d76a172434d62200'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr  9 21:03:39 2015 +0200| [fe25194c5870f21ba10f615f036b64d0c84fca48] | committer: Michael Niedermayer

Merge commit 'c201069fac9a76e6604f9d84d76a172434d62200'

* commit 'c201069fac9a76e6604f9d84d76a172434d62200':
  avdevice: Add missing header for NULL_IF_CONFIG_SMALL

Conflicts:
	libavdevice/alsa-audio-dec.c
	libavdevice/alsa-audio-enc.c
	libavdevice/pulse_audio_dec.c
	libavdevice/sndio_enc.c
	libavdevice/vfwcap.c
	libavdevice/x11grab.c
	libavdevice/xcbgrab.c

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

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