diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-07-28 12:40:35 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-07-28 12:40:35 +0000 |
commit | 57b8d5c7f6d6f85e2556a4f4bbf5393e1e7f92a5 (patch) | |
tree | e5bc3f0b7ee6cb2a7e24f67e83e6cfa0db56662c /libmpdemux | |
parent | bb98df04568d08d07bde9857c94aa3d5cf726b3a (diff) | |
download | mpv-57b8d5c7f6d6f85e2556a4f4bbf5393e1e7f92a5.tar.bz2 mpv-57b8d5c7f6d6f85e2556a4f4bbf5393e1e7f92a5.tar.xz |
fixes a crash and unchecked string-handling in ENCA code.
Also does a bit of cleanup.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12910 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/demux_mkv.c | 2 | ||||
-rw-r--r-- | libmpdemux/demux_mkv_old.cpp | 2 | ||||
-rw-r--r-- | libmpdemux/demux_ogg.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index 4aff2abd61..5e48363e4e 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -2018,7 +2018,7 @@ demux_mkv_open (demuxer_t *demuxer) char *str; #ifdef USE_ICONV - subcp_open_noenca(); + subcp_open(NULL); #endif stream_seek(s, s->start_pos); diff --git a/libmpdemux/demux_mkv_old.cpp b/libmpdemux/demux_mkv_old.cpp index d3ea0f452e..10f8c57443 100644 --- a/libmpdemux/demux_mkv_old.cpp +++ b/libmpdemux/demux_mkv_old.cpp @@ -1552,7 +1552,7 @@ extern "C" int demux_mkv_open(demuxer_t *demuxer) { qt_image_description_t *idesc; #ifdef USE_ICONV - subcp_open_noenca(); + subcp_open(NULL); #endif s = demuxer->stream; diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index aaa11b6a34..5b3a656519 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -669,7 +669,7 @@ int demux_ogg_open(demuxer_t* demuxer) { sh_video_t* sh_v; #ifdef USE_ICONV - subcp_open_noenca(); + subcp_open(NULL); #endif clear_sub = -1; |