1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
FFmpeg/libavformat
Michael Niedermayer 92b03cf926 Merge commit '601d6228c4811d8971a2412a759e1a4ab775ebe8'
* 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>
2013-10-13 09:37:21 +02:00
..
2013-10-12 20:21:38 +00:00
2013-10-06 19:36:53 +02:00
2013-09-18 14:10:05 -04:00
2013-09-21 15:36:33 +02:00
2013-09-21 03:26:54 +02:00
2013-09-21 15:36:33 +02:00
2013-09-21 15:36:33 +02:00
2013-08-23 20:05:35 +02:00
2013-09-21 15:36:33 +02:00
2013-09-21 15:36:33 +02:00