diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-28 12:49:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-28 12:49:28 +0200 |
| commit | 1c0ce2d4e0e70fcc42aa73fb5284f621025bb6c4 (patch) | |
| tree | 08d7d701df1802b6f72d84eb67e9962415ff8a13 /libavutil/xga_font_data.c | |
| parent | 69de229bb8818e97c88ad34840c9bd4a6854b647 (diff) | |
| parent | 4efdadc8ec50332c812e8a95e8c67f5a260e7cb0 (diff) | |
| download | ffmpeg-1c0ce2d4e0e70fcc42aa73fb5284f621025bb6c4.tar.gz | |
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>
Diffstat (limited to 'libavutil/xga_font_data.c')
0 files changed, 0 insertions, 0 deletions