Michael Niedermayer 92b03cf926 Merge commit '601d6228c4811d8971a2412a759e1a4ab775ebe8' ...

* commit '601d6228c4811d8971a2412a759e1a4ab775ebe8':
  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

1.1 KiB

Raw Blame History

View Raw