Merge commit 'd6e1d371'
* commit 'd6e1d371': oss_audio: Split muxer and demuxer Conflicts: libavdevice/Makefile libavdevice/oss_audio.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Showing
libavdevice/oss_audio.h
0 → 100644
libavdevice/oss_audio_dec.c
0 → 100644
libavdevice/oss_audio_enc.c
0 → 100644
Please
register
or
sign in
to comment