Commit b1b58310 authored 9 years ago by Michael Niedermayer

Merge commit '8d26c193'


* commit '8d26c193':
  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>

parents 259fd4c7 8d26c193

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing with 28 additions and 30 deletions

Please register or to comment