summaryrefslogtreecommitdiffstats
path: root/libavdevice/sndio.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'Michael Niedermayer2015-04-091-5/+5
| | | | | | | | | | | | | | * 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>
* avdevice: Apply a more consistent file naming schemeDiego Biurrun2015-04-091-0/+120
OpenPOWER on IntegriCloud