Merge commit 'c201069fac9a76e6604f9d84d76a172434d62200'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Apr 2015 19:03:39 +0000 (21:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Apr 2015 19:07:24 +0000 (21:07 +0200)
commitfe25194c5870f21ba10f615f036b64d0c84fca48
treeec4aa330575d647588e90d2201cc54d5d1b1c174
parent71288bf80f37bdc0795396930d8b97c781c94587
parentc201069fac9a76e6604f9d84d76a172434d62200
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@gmx.at>
libavdevice/alsa-audio-dec.c
libavdevice/alsa-audio-enc.c
libavdevice/jack_audio.c
libavdevice/libdc1394.c
libavdevice/pulse_audio_dec.c
libavdevice/sndio_dec.c
libavdevice/sndio_enc.c
libavdevice/vfwcap.c
libavdevice/x11grab.c
libavdevice/xcbgrab.c