vlc | branch: master | Felix Abecassis <felix.abecas...@gmail.com> | Mon May 12 11:13:48 2014 +0200| [7f318cff999f87f69952f7243c2800ce081539db] | committer: Felix Abecassis
mkv: fix declaration/definition mismatch of demux_sys_t Kill many compiler warnings. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7f318cff999f87f69952f7243c2800ce081539db --- modules/demux/mkv/chapter_command.hpp | 2 +- modules/demux/mkv/demux.hpp | 2 +- modules/demux/mkv/mkv.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/demux/mkv/chapter_command.hpp b/modules/demux/mkv/chapter_command.hpp index 7c8a3c1..80b3e45 100644 --- a/modules/demux/mkv/chapter_command.hpp +++ b/modules/demux/mkv/chapter_command.hpp @@ -35,7 +35,7 @@ const binary MATROSKA_DVD_LEVEL_PG = 0x18; const binary MATROSKA_DVD_LEVEL_PTT = 0x10; const binary MATROSKA_DVD_LEVEL_CN = 0x08; -class demux_sys_t; +struct demux_sys_t; class chapter_codec_cmds_c { diff --git a/modules/demux/mkv/demux.hpp b/modules/demux/mkv/demux.hpp index c295f13..f6b910b 100644 --- a/modules/demux/mkv/demux.hpp +++ b/modules/demux/mkv/demux.hpp @@ -326,7 +326,7 @@ private: }; -class demux_sys_t +struct demux_sys_t { public: demux_sys_t( demux_t & demux ) diff --git a/modules/demux/mkv/mkv.cpp b/modules/demux/mkv/mkv.cpp index b2b85bb..c1dd781 100644 --- a/modules/demux/mkv/mkv.cpp +++ b/modules/demux/mkv/mkv.cpp @@ -73,7 +73,7 @@ vlc_module_begin () add_shortcut( "mka", "mkv" ) vlc_module_end () -class demux_sys_t; +struct demux_sys_t; static int Demux ( demux_t * ); static int Control( demux_t *, int, va_list ); _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits