Merge commit '0955e57ad07640574fc20ce0bea3c0b83982ada1'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 3 Jul 2014 19:42:16 +0000 (21:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 3 Jul 2014 19:42:16 +0000 (21:42 +0200)
commita9ce5d92e6148cbf9016052839159059905320ef
tree5f9b15ba0b597f3a0b59db4cef6ce9a855c1e278
parent524eeaca228043c93d0f94ffe9c51149c0408f04
parent0955e57ad07640574fc20ce0bea3c0b83982ada1
Merge commit '0955e57ad07640574fc20ce0bea3c0b83982ada1'

* commit '0955e57ad07640574fc20ce0bea3c0b83982ada1':
  daud: split muxer and demuxer

Conflicts:
libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/Makefile
libavformat/dauddec.c
libavformat/daudenc.c