Skip to content
Snippets Groups Projects
Commit fe25194c authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit 'c201069f' 


* commit 'c201069f':
  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: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 71288bf8 c201069f
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 45 additions and 21 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment