Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Apr 2015 19:36:42 +0000 (21:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Apr 2015 19:36:42 +0000 (21:36 +0200)
commitb1b58310d09297eb8e64b156e6da3406bc866cce
tree9314f08b45e3e58b6afb667d4f30a05dabe497e0
parent259fd4c7cfb8afbb022921b44fe6611fcefff3b1
parent8d26c193fb42d08602ac93ece039d4718d029adc
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>
14 files changed:
libavdevice/Makefile
libavdevice/alsa.c
libavdevice/alsa.h
libavdevice/alsa_dec.c
libavdevice/alsa_enc.c
libavdevice/jack.c
libavdevice/oss.c
libavdevice/oss.h
libavdevice/oss_dec.c
libavdevice/oss_enc.c
libavdevice/sndio.c
libavdevice/sndio.h
libavdevice/sndio_dec.c
libavdevice/sndio_enc.c