Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge commit '601d6228c4811d8971a2412a759e1a4ab775ebe8' | Michael Niedermayer | 2013-10-13 |
| | | | | | | | | | | | | * commit '601d6228c4811d8971a2412a759e1a4ab775ebe8': flac: move picture parsing code in a separate file Conflicts: libavformat/Makefile libavformat/flacdec.c See: 1e5bbbfcf303ec3db0c7db30b85855e2e5358aec Merged-by: Michael Niedermayer <michaelni@gmx.at> | ||
* | flac: move picture parsing code in a separate file | James Almer | 2013-10-12 |
Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net> |