Merge branch 'greenleon' of git.sv.gnu.org:/srv/git/libcdio

Conflicts: lib/driver/image/bincue.c
2012-03-10 16:13:58 -05:00
parent 8023341b0b 0c7c1104fd
commit 892ff0522e
32 changed files with 1672 additions and 1210 deletions
--- a/include/cdio/utf8.h
+++ b/include/cdio/utf8.h
@@ -87,7 +87,7 @@ bool cdio_charset_from_utf8(cdio_utf8_t * src, char ** dst,
 */


-bool cdio_charset_to_utf8(char *src, size_t src_len, cdio_utf8_t **dst,
+bool cdio_charset_to_utf8(const char *src, size_t src_len, cdio_utf8_t **dst,
                          const char * src_charset);

 #ifdef _WIN32