| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e' | Michael Niedermayer | 2014-07-19 | 1 | -5/+8 |
| | | | | | | | | | | | | * 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 demuxer | Nidhi Makhijani | 2014-07-18 | 1 | -0/+146 |
| Signed-off-by: Diego Biurrun <diego@biurrun.de> | |||||
 |
index : ffmpeg-streaming | |
| Raptor Engineering's fork of FFmpeg with streaming enhancements https://git.ffmpeg.org/ffmpeg.git | Raptor Engineering, LLC |
| summaryrefslogtreecommitdiffstats |
|