[FFmpeg-cvslog] Merge commit '0955e57ad07640574fc20ce0bea3c0b83982ada1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jul  3 21:42:16 2014 +0200| [a9ce5d92e6148cbf9016052839159059905320ef] | committer: Michael Niedermayer

Merge commit '0955e57ad07640574fc20ce0bea3c0b83982ada1'

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

Conflicts:
	libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a9ce5d92e6148cbf9016052839159059905320ef
---