1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
FFmpeg/libavformat
Michael Niedermayer 1c0ce2d4e0 Merge commit '4efdadc8ec50332c812e8a95e8c67f5a260e7cb0'
* commit '4efdadc8ec50332c812e8a95e8c67f5a260e7cb0':
  matroskadec: export just the STREAMINFO block as FLAC extradata

Conflicts:
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-28 12:49:28 +02:00
..
2014-05-17 20:13:33 +02:00
2014-05-20 00:00:45 +02:00
2014-04-27 14:50:14 +02:00
2014-05-20 00:00:45 +02:00
2014-04-16 19:41:41 +02:00
2014-04-16 19:41:41 +02:00
2014-04-14 21:40:59 +02:00
2014-04-22 20:44:31 +02:00
2014-05-07 23:39:47 +02:00
2014-05-17 20:13:33 +02:00
2014-04-27 15:14:32 +02:00
2014-05-28 01:12:18 +02:00
2014-04-20 20:56:02 +02:00
2014-04-23 15:10:42 +02:00
2014-05-17 20:13:33 +02:00
2014-05-07 23:39:47 +02:00
2014-04-15 13:51:48 +02:00