2 Commits

Author	SHA1	Message	Date
Michael Niedermayer	508a5349da	Merge commit '3dd5c95deef51d7fbf6f4458ba42d1335d2f1472' ... * commit '3dd5c95deef51d7fbf6f4458ba42d1335d2f1472': riff: Move muxing code to a separate file Conflicts: configure libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2013-08-06 18:08:30 +02:00
Diego Biurrun	3dd5c95dee	riff: Move muxing code to a separate file	2013-08-06 11:02:35 +02:00