diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-03 21:42:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-03 21:42:16 +0200 |
| commit | a9ce5d92e6148cbf9016052839159059905320ef (patch) | |
| tree | 5f9b15ba0b597f3a0b59db4cef6ce9a855c1e278 /COPYING.GPLv3 | |
| parent | 524eeaca228043c93d0f94ffe9c51149c0408f04 (diff) | |
| parent | 0955e57ad07640574fc20ce0bea3c0b83982ada1 (diff) | |
| download | ffmpeg-a9ce5d92e6148cbf9016052839159059905320ef.tar.gz | |
Merge commit '0955e57ad07640574fc20ce0bea3c0b83982ada1'
* commit '0955e57ad07640574fc20ce0bea3c0b83982ada1':
daud: split muxer and demuxer
Conflicts:
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'COPYING.GPLv3')
0 files changed, 0 insertions, 0 deletions