From c5e1f64a435507f0918e970300a1a536c4d3ed35 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Sun, 11 Sep 2011 09:04:00 +0000 Subject: [PATCH] Move definition of KaxCodeVersion into the library git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/libmatroska@804 a6f86f6d-0131-4f8e-9e7b-e335508773d5 --- matroska/KaxVersion.h | 4 +-- src/KaxVersion.cpp | 83 ++++++++++++++++++++++--------------------- 2 files changed, 45 insertions(+), 42 deletions(-) diff --git a/matroska/KaxVersion.h b/matroska/KaxVersion.h index 11233d8..afe532c 100644 --- a/matroska/KaxVersion.h +++ b/matroska/KaxVersion.h @@ -42,8 +42,8 @@ START_LIBMATROSKA_NAMESPACE #define LIBMATROSKA_VERSION 0x010200 -static const std::string KaxCodeVersion = "1.2.0"; -static const std::string KaxCodeDate = __TIMESTAMP__; +extern const std::string KaxCodeVersion; +extern const std::string KaxCodeDate; /*! \todo Improve the CRC/ECC system (backward and forward possible ?) to fit streaming/live writing/simple reading diff --git a/src/KaxVersion.cpp b/src/KaxVersion.cpp index 992c2db..1e5eaa1 100644 --- a/src/KaxVersion.cpp +++ b/src/KaxVersion.cpp @@ -1,40 +1,43 @@ -/**************************************************************************** -** libmatroska : parse Matroska files, see http://www.matroska.org/ -** -** -** -** Copyright (C) 2002-2010 Steve Lhomme. All rights reserved. -** -** This file is part of libmatroska. -** -** This library is free software; you can redistribute it and/or -** modify it under the terms of the GNU Lesser General Public -** License as published by the Free Software Foundation; either -** version 2.1 of the License, or (at your option) any later version. -** -** This library is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** Lesser General Public License for more details. -** -** You should have received a copy of the GNU Lesser General Public -** License along with this library; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -** -** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** -** Contact license@matroska.org if any conditions of this licensing are -** not clear to you. -** -**********************************************************************/ - -/*! - \file - \version \$Id: KaxVersion.cpp 640 2004-07-09 21:05:36Z mosu $ - \author Steve Lhomme -*/ - -#include "matroska/KaxVersion.h" - -START_LIBMATROSKA_NAMESPACE - -END_LIBMATROSKA_NAMESPACE +/**************************************************************************** +** libmatroska : parse Matroska files, see http://www.matroska.org/ +** +** +** +** Copyright (C) 2002-2010 Steve Lhomme. All rights reserved. +** +** This file is part of libmatroska. +** +** This library is free software; you can redistribute it and/or +** modify it under the terms of the GNU Lesser General Public +** License as published by the Free Software Foundation; either +** version 2.1 of the License, or (at your option) any later version. +** +** This library is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** Lesser General Public License for more details. +** +** You should have received a copy of the GNU Lesser General Public +** License along with this library; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** +** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.** +** Contact license@matroska.org if any conditions of this licensing are +** not clear to you. +** +**********************************************************************/ + +/*! + \file + \version \$Id: KaxVersion.cpp 640 2004-07-09 21:05:36Z mosu $ + \author Steve Lhomme +*/ + +#include "matroska/KaxVersion.h" + +START_LIBMATROSKA_NAMESPACE + +const std::string KaxCodeVersion = "1.2.0"; +const std::string KaxCodeDate = __TIMESTAMP__; + +END_LIBMATROSKA_NAMESPACE -- 2.40.0