aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/riffdec.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '255d9c570e117f0fcb8e51fa2c5996f3c4b2052b'Michael Niedermayer2013-08-061-16/+34
| | | | | | | | | | | * commit '255d9c570e117f0fcb8e51fa2c5996f3c4b2052b': riff: Move demuxing code to a separate file. Conflicts: configure libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* riff: Move demuxing code to a separate file.Diego Biurrun2013-08-061-0/+229