diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-10 02:32:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-10 02:32:12 +0100 |
| commit | 3b8299c1e1c72fdd4284d88e7d426bd35689acd3 (patch) | |
| tree | 6d3df80c51f8c65829bc8b764c330b06df67bc3f /libavcodec/bmp_parser.c | |
| parent | 4162ceea93684f3cd656dc21d30903e102a44e73 (diff) | |
| parent | aa69cbc9e08281db6ecb98a2c8b4f60e8b12e558 (diff) | |
| download | ffmpeg-3b8299c1e1c72fdd4284d88e7d426bd35689acd3.tar.gz | |
Merge commit 'aa69cbc9e08281db6ecb98a2c8b4f60e8b12e558'
* commit 'aa69cbc9e08281db6ecb98a2c8b4f60e8b12e558':
flac muxer: add option to disable writing the global header
Conflicts:
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/bmp_parser.c')
0 files changed, 0 insertions, 0 deletions