Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2025-01-13 05:31:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix compilation without FLAC

Browse Source 
Fix for issue #13.
This commit is contained in:
Moritz Bunkus 2011-12-21 16:25:20 +01:00
parent a267ba92d4
commit a803ffaa11
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2011-12-21 Moritz Bunkus <moritz@bunkus.org>
* mkvmerge: bug fix: Fix compilation if FLAC is not available. Fix
for issue #13.
2011-12-18 Moritz Bunkus <moritz@bunkus.org>
* Released v5.2.0.

8
src/input/r_flac.cpp
View File

@ -343,17 +343,17 @@ flac_reader_c::identify() {
#else // HAVE_FLAC_FORMAT_H
bool
flac_reader_c::probe_file(mm_io_c *io,
flac_reader_c::probe_file(mm_io_c *in,
uint64_t size) {
if (4 > size)
return false;
std::string data;
try {
io->setFilePointer(0, seek_beginning);
if (io->read(data, 4) != 4)
in->setFilePointer(0, seek_beginning);
if (in->read(data, 4) != 4)
return false;
io->setFilePointer(0, seek_beginning);
in->setFilePointer(0, seek_beginning);
if (data == "fLaC")
id_result_container_unsupported(in->get_file_name(), "FLAC");