summaryrefslogtreecommitdiff
path: root/libavformat/daudenc.c
Commit message (Collapse)AuthorAge
* Merge commit '0955e57ad07640574fc20ce0bea3c0b83982ada1'Michael Niedermayer2014-07-03
| | | | | | | | | | * commit '0955e57ad07640574fc20ce0bea3c0b83982ada1': daud: split muxer and demuxer Conflicts: libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
* daud: split muxer and demuxerNidhi Makhijani2014-07-03
Signed-off-by: Diego Biurrun <diego@biurrun.de>