[FFmpeg-cvslog] Merge commit '3dd5c95deef51d7fbf6f4458ba42d1335d2f1472'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug  6 18:07:59 2013 +0200| [508a5349da9869382803445f8e380751ec43021e] | committer: Michael Niedermayer

Merge commit '3dd5c95deef51d7fbf6f4458ba42d1335d2f1472'

* commit '3dd5c95deef51d7fbf6f4458ba42d1335d2f1472':
  riff: Move muxing code to a separate file

Conflicts:
	configure
	libavformat/riff.c

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

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