Age | Commit message (Collapse) | Author | |
---|---|---|---|
2014-07-19 | Merge commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e' | Michael Niedermayer | |
* commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e': oss_audio: Split muxer and demuxer Conflicts: libavdevice/Makefile libavdevice/oss_audio.c Merged-by: Michael Niedermayer <michaelni@gmx.at> | |||
2014-07-19 | oss_audio: Split muxer and demuxer | Nidhi Makhijani | |
Signed-off-by: Diego Biurrun <diego@biurrun.de> |