Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit '0955e57ad07640574fc20ce0bea3c0b83982ada1' | Michael Niedermayer | 2014-07-03 | 1 | -4/+4 |
| | | | | | | | | | | * commit '0955e57ad07640574fc20ce0bea3c0b83982ada1': daud: split muxer and demuxer Conflicts: libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at> | ||||
* | daud: split muxer and demuxer | Nidhi Makhijani | 2014-07-03 | 1 | -0/+54 |
Signed-off-by: Diego Biurrun <diego@biurrun.de> |