Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* commit '3dd5c95deef51d7fbf6f4458ba42d1335d2f1472': riff: Move muxing code to a separate file Conflicts: configure libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>