[FFmpeg-cvslog] Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr  9 21:36:42 2015 +0200| [b1b58310d09297eb8e64b156e6da3406bc866cce] | committer: Michael Niedermayer

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 at gmx.at>

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