2 commits

Author	SHA1	Message	Date
Michael Niedermayer	92b03cf926	Merge commit '601d6228c4' ... * commit '601d6228c4': flac: move picture parsing code in a separate file Conflicts: libavformat/Makefile libavformat/flacdec.c See: 1e5bbbfcf3 Merged-by: Michael Niedermayer <michaelni@gmx.at>	2013-10-13 09:37:21 +02:00
James Almer	601d6228c4	flac: move picture parsing code in a separate file ... Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>	2013-10-12 15:30:39 +02:00