2 Commits

Author	SHA1	Message	Date
Michael Niedermayer	0a8f5eb23a	Merge commit '255d9c570e117f0fcb8e51fa2c5996f3c4b2052b' ... * commit '255d9c570e117f0fcb8e51fa2c5996f3c4b2052b': riff: Move demuxing code to a separate file. Conflicts: configure libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2013-08-06 18:30:47 +02:00
Diego Biurrun	255d9c570e	riff: Move demuxing code to a separate file.	2013-08-06 11:02:36 +02:00