diff --git a/ChangeLog b/ChangeLog index 25c69fe8c..d54a33d84 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-12-21 Moritz Bunkus + + * mkvmerge: bug fix: Fix compilation if FLAC is not available. Fix + for issue #13. + 2011-12-18 Moritz Bunkus * Released v5.2.0. diff --git a/src/input/r_flac.cpp b/src/input/r_flac.cpp index 67b47c20a..e00fc9b04 100644 --- a/src/input/r_flac.cpp +++ b/src/input/r_flac.cpp @@ -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");