Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit '255d9c570e117f0fcb8e51fa2c5996f3c4b2052b' | Michael Niedermayer | 2013-08-06 | 1 | -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 Biurrun | 2013-08-06 | 1 | -0/+229 |