summaryrefslogtreecommitdiff
path: root/libavdevice/oss_audio_enc.c
Commit message (Collapse)AuthorAge
* Merge commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e'Michael Niedermayer2014-07-19
| | | | | | | | | | | * commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e': oss_audio: Split muxer and demuxer Conflicts: libavdevice/Makefile libavdevice/oss_audio.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* oss_audio: Split muxer and demuxerNidhi Makhijani2014-07-18
Signed-off-by: Diego Biurrun <diego@biurrun.de>