2 Commits

Author	SHA1	Message	Date
Michael Niedermayer	b1b58310d0	Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc' ... * commit '8d26c193fb42d08602ac93ece039d4718d029adc': avdevice: Apply a more consistent file naming scheme Conflicts: libavdevice/Makefile libavdevice/alsa.h libavdevice/alsa_dec.c libavdevice/alsa_enc.c libavdevice/sndio_enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2015-04-09 21:36:42 +02:00
Diego Biurrun	8d26c193fb	avdevice: Apply a more consistent file naming scheme	2015-04-09 16:40:12 +02:00