[arch-commits] Commit in ffmpegsource/repos (10 files)
Maxime Gauduin
alucryd at nymeria.archlinux.org
Tue Feb 26 15:11:09 UTC 2013
Date: Tuesday, February 26, 2013 @ 16:11:09
Author: alucryd
Revision: 84951
archrelease: copy trunk to community-i686, community-x86_64
Added:
ffmpegsource/repos/community-i686/PKGBUILD
(from rev 84950, ffmpegsource/trunk/PKGBUILD)
ffmpegsource/repos/community-i686/autoconf.patch
(from rev 84950, ffmpegsource/trunk/autoconf.patch)
ffmpegsource/repos/community-x86_64/PKGBUILD
(from rev 84950, ffmpegsource/trunk/PKGBUILD)
ffmpegsource/repos/community-x86_64/autoconf.patch
(from rev 84950, ffmpegsource/trunk/autoconf.patch)
Deleted:
ffmpegsource/repos/community-i686/PKGBUILD
ffmpegsource/repos/community-i686/autoconf.patch
ffmpegsource/repos/community-i686/ffmpeg.patch
ffmpegsource/repos/community-x86_64/PKGBUILD
ffmpegsource/repos/community-x86_64/autoconf.patch
ffmpegsource/repos/community-x86_64/ffmpeg.patch
---------------------------------+
community-i686/PKGBUILD | 98 +++++++++++++++++++++-----------------
community-i686/autoconf.patch | 44 ++++++++---------
community-i686/ffmpeg.patch | 89 ----------------------------------
community-x86_64/PKGBUILD | 98 +++++++++++++++++++++-----------------
community-x86_64/autoconf.patch | 44 ++++++++---------
community-x86_64/ffmpeg.patch | 89 ----------------------------------
6 files changed, 156 insertions(+), 306 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-02-26 15:08:55 UTC (rev 84950)
+++ community-i686/PKGBUILD 2013-02-26 15:11:09 UTC (rev 84951)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Maxime Gauduin <alucryd at gmail.com>
-
-pkgname=ffmpegsource
-pkgver=2.17
-pkgrel=9
-pkgdesc="A libav/ffmpeg based source library and Avisynth plugin for easy frame accurate access"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/ffmpegsource/"
-license=('MIT')
-depends=('ffmpeg')
-options=('!libtool')
-source=("http://ffmpegsource.googlecode.com/files/ffms-${pkgver}-src.tar.bz2" 'autoconf.patch' 'ffmpeg.patch')
-sha256sums=('991f7a77982823afdcf0beb8961deddaf7dd0aea949249e51fbf51cb3314643d'
- '77e5185f91249b8d032958abb142827a5349b06ff1b4fbd4c5c87ccea811273d'
- 'adc08b58dec29b04be9d9eb2f12c2fa836565d363aafcfc3e785ae4692db6845')
-
-build() {
- cd "${srcdir}"/ffms-${pkgver}-src
-
-# Patch
- patch -Np1 -i "${srcdir}"/autoconf.patch
- patch -Np1 -i "${srcdir}"/ffmpeg.patch
- mv configure.in configure.ac
-
-# Build
- ./autogen.sh --prefix=/usr --enable-shared --disable-static
- make
-}
-
-package() {
- cd "${srcdir}"/ffms-${pkgver}-src
-
-# Install
- make DESTDIR="${pkgdir}" install
-
-# License
- install -dm 755 "${pkgdir}"/usr/share/licenses/ffmpegsource
- install -m 644 COPYING "${pkgdir}"/usr/share/licenses/ffmpegsource/LICENSE
-}
-
-# vim: ts=2 sw=2 et:
Copied: ffmpegsource/repos/community-i686/PKGBUILD (from rev 84950, ffmpegsource/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-02-26 15:11:09 UTC (rev 84951)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Maxime Gauduin <alucryd at gmail.com>
+
+pkgname=ffmpegsource
+pkgver=743
+pkgrel=1
+pkgdesc="A libav/ffmpeg based source library and Avisynth plugin for easy frame accurate access"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/ffmpegsource/"
+license=('MIT')
+depends=('ffmpeg')
+makedepends=('svn')
+options=('!libtool')
+source=('autoconf.patch')
+sha256sums=('b09a7e9a08a16bdaf19d43c7ad8d3ec455f6fecec2f4f5ada417345343adda93')
+
+_svntrunk=http://ffmpegsource.googlecode.com/svn/trunk/
+_svnmod=ffmpegsource
+
+build() {
+ cd "${srcdir}"
+ msg "Connecting to SVN server...."
+
+ if [[ -d ${_svnmod}/.svn ]]; then
+ (cd ${_svnmod} && svn up -r ${pkgver})
+ else
+ svn co ${_svntrunk} --config-dir ./ -r ${pkgver} ${_svnmod}
+ fi
+
+ msg "SVN checkout done or server timeout"
+ msg "Starting build..."
+
+ rm -rf "${srcdir}"/${_svnmod}-build
+ svn export "${srcdir}"/${_svnmod} "${srcdir}"/${_svnmod}-build
+ cd "${srcdir}"/${_svnmod}-build
+
+# Patch
+ patch -Np1 -i "${srcdir}"/autoconf.patch
+
+# Build
+ ./autogen.sh --prefix=/usr --enable-shared --disable-static
+ make
+}
+
+package() {
+ cd "${srcdir}"/${_svnmod}-build
+
+# Install
+ make DESTDIR="${pkgdir}" install
+
+# License
+ install -dm 755 "${pkgdir}"/usr/share/licenses/ffmpegsource
+ install -m 644 COPYING "${pkgdir}"/usr/share/licenses/ffmpegsource/LICENSE
+}
+
+# vim: ts=2 sw=2 et:
Deleted: community-i686/autoconf.patch
===================================================================
--- community-i686/autoconf.patch 2013-02-26 15:08:55 UTC (rev 84950)
+++ community-i686/autoconf.patch 2013-02-26 15:11:09 UTC (rev 84951)
@@ -1,22 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -6,7 +6,7 @@ pkgconfig_DATA = ffms2.pc
-
- dist_doc_DATA = doc/ffms2-api.html doc/ffms2-changelog.html doc/style.css
-
--INCLUDES = -I. -I$(top_srcdir)/include -I$(top_srcdir)/src/config @LIBAV_CFLAGS@ @ZLIB_CPPFLAGS@ -include config.h
-+AM_CPPFLAGS = -I. -I$(top_srcdir)/include -I$(top_srcdir)/src/config @LIBAV_CFLAGS@ @ZLIB_CPPFLAGS@ -include config.h
-
- lib_LTLIBRARIES = src/core/libffms2.la
- src_core_libffms2_la_LIBADD = @LIBAV_LIBS@ @ZLIB_LDFLAGS@ -lz @LTUNDEF@
---- a/configure.in
-+++ b/configure.in
-@@ -30,7 +30,7 @@ if test -z "$CXXFLAGS"; then
- CXXFLAGS="$OPT_FLAGS"
- fi
-
--AM_CONFIG_HEADER([src/config/config.h])
-+AC_CONFIG_HEADERS([src/config/config.h])
- AC_PROG_CC
- AC_PROG_CXX
- LT_INIT([static disable-shared])
Copied: ffmpegsource/repos/community-i686/autoconf.patch (from rev 84950, ffmpegsource/trunk/autoconf.patch)
===================================================================
--- community-i686/autoconf.patch (rev 0)
+++ community-i686/autoconf.patch 2013-02-26 15:11:09 UTC (rev 84951)
@@ -0,0 +1,22 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -6,7 +6,7 @@ pkgconfig_DATA = ffms2.pc
+
+ dist_doc_DATA = doc/ffms2-api.html doc/ffms2-changelog.html doc/style.css
+
+-INCLUDES = -I. -I$(top_srcdir)/include -I$(top_srcdir)/src/config @LIBAV_CFLAGS@ @ZLIB_CPPFLAGS@ -include config.h
++AM_CPPFLAGS = -I. -I$(top_srcdir)/include -I$(top_srcdir)/src/config @LIBAV_CFLAGS@ @ZLIB_CPPFLAGS@ -include config.h
+
+ lib_LTLIBRARIES = src/core/libffms2.la
+ src_core_libffms2_la_LIBADD = @LIBAV_LIBS@ @ZLIB_LDFLAGS@ -lz @LTUNDEF@
+--- a/configure.ac
++++ b/configure.ac
+@@ -30,7 +30,7 @@ if test -z "$CXXFLAGS"; then
+ CXXFLAGS="$OPT_FLAGS"
+ fi
+
+-AM_CONFIG_HEADER([src/config/config.h])
++AC_CONFIG_HEADERS([src/config/config.h])
+ AC_PROG_CC
+ AC_PROG_CXX
+ LT_INIT([static disable-shared])
Deleted: community-i686/ffmpeg.patch
===================================================================
--- community-i686/ffmpeg.patch 2013-02-26 15:08:55 UTC (rev 84950)
+++ community-i686/ffmpeg.patch 2013-02-26 15:11:09 UTC (rev 84951)
@@ -1,89 +0,0 @@
---- ffms-2.17-src.orig/configure.in
-+++ ffms-2.17-src/configure.in
-@@ -135,7 +135,7 @@ AC_DEFUN([TEST_LIBAV],
- #include <libavcodec/avcodec.h>
- #include <libswscale/swscale.h>
- ]],[[
-- avcodec_init();
-+ av_register_all();
- swscale_version();
- #ifdef FFMS_USE_FFMPEG_COMPAT
- int bogus = CODEC_ID_G2M;
---- ffms-2.17-src.orig/include/ffmscompat.h
-+++ ffms-2.17-src/include/ffmscompat.h
-@@ -84,6 +84,14 @@
- # else
- # define FFMS_CALCULATE_DELAY (CodecContext->has_b_frames + (CodecContext->thread_count - 1))
- # endif
-+# if VERSION_CHECK(LIBAVCODEC_VERSION_INT, <, 54, 25, 0, 54, 51, 100)
-+# define FFMS_ID(x) (CODEC_ID_##x)
-+# define FFMS_CodecID CodecID
-+# else
-+# define FFMS_ID(x) (AV_CODEC_ID_##x)
-+# define FFMS_CodecID AVCodecID
-+# undef CodecID
-+# endif
- #endif
-
- #ifdef LIBAVUTIL_VERSION_INT
---- ffms-2.17-src.orig/src/core/codectype.cpp
-+++ ffms-2.17-src/src/core/codectype.cpp
-@@ -25,7 +25,7 @@
-
- typedef struct CodecTags {
- char str[20];
-- CodecID id;
-+ FFMS_CodecID id;
- } CodecTags;
-
- static const CodecTags mkv_codec_tags[] = {
-@@ -92,7 +92,7 @@ static const CodecTags mkv_codec_tags[]
- };
-
- typedef struct AVCodecTag {
-- enum CodecID id;
-+ enum FFMS_CodecID id;
- unsigned int tag;
- } AVCodecTag;
-
-@@ -400,7 +400,7 @@ const char *GetLAVCSampleFormatName(AVSa
- }
- }
-
--CodecID MatroskaToFFCodecID(char *Codec, void *CodecPrivate, unsigned int FourCC, unsigned int BitsPerSample) {
-+FFMS_CodecID MatroskaToFFCodecID(char *Codec, void *CodecPrivate, unsigned int FourCC, unsigned int BitsPerSample) {
- /* Look up native codecs */
- for(int i = 0; mkv_codec_tags[i].id != CODEC_ID_NONE; i++){
- if(!strncmp(mkv_codec_tags[i].str, Codec,
-@@ -408,7 +408,7 @@ CodecID MatroskaToFFCodecID(char *Codec,
-
- // Uncompressed and exotic format fixup
- // This list is incomplete
-- CodecID CID = mkv_codec_tags[i].id;
-+ FFMS_CodecID CID = mkv_codec_tags[i].id;
- switch (CID) {
- case CODEC_ID_PCM_S16LE:
- switch (BitsPerSample) {
---- ffms-2.17-src.orig/src/core/codectype.h
-+++ ffms-2.17-src/src/core/codectype.h
-@@ -27,5 +27,5 @@ extern "C" {
- #include "ffmscompat.h"
-
- FFMS_TrackType HaaliTrackTypeToFFTrackType(int TT);
--CodecID MatroskaToFFCodecID(char *Codec, void *CodecPrivate, unsigned int FourCC = 0, unsigned int BitsPerSample = 0);
-+FFMS_CodecID MatroskaToFFCodecID(char *Codec, void *CodecPrivate, unsigned int FourCC = 0, unsigned int BitsPerSample = 0);
- const char *GetLAVCSampleFormatName(AVSampleFormat s);
---- ffms-2.17-src.orig/src/core/matroskaparser.h
-+++ ffms-2.17-src/src/core/matroskaparser.h
-@@ -32,6 +32,11 @@
- #ifndef MATROSKA_PARSER_H
- #define MATROSKA_PARSER_H
-
-+/* Make sure we undefine CodecID, since libavcodec defines it as AVCodec ID */
-+#ifdef CodecID
-+#undef CodecID
-+#endif
-+
- /* Random notes:
- *
- * The parser does not process frame data in any way and does not read it into
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-02-26 15:08:55 UTC (rev 84950)
+++ community-x86_64/PKGBUILD 2013-02-26 15:11:09 UTC (rev 84951)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Maxime Gauduin <alucryd at gmail.com>
-
-pkgname=ffmpegsource
-pkgver=2.17
-pkgrel=9
-pkgdesc="A libav/ffmpeg based source library and Avisynth plugin for easy frame accurate access"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/ffmpegsource/"
-license=('MIT')
-depends=('ffmpeg')
-options=('!libtool')
-source=("http://ffmpegsource.googlecode.com/files/ffms-${pkgver}-src.tar.bz2" 'autoconf.patch' 'ffmpeg.patch')
-sha256sums=('991f7a77982823afdcf0beb8961deddaf7dd0aea949249e51fbf51cb3314643d'
- '77e5185f91249b8d032958abb142827a5349b06ff1b4fbd4c5c87ccea811273d'
- 'adc08b58dec29b04be9d9eb2f12c2fa836565d363aafcfc3e785ae4692db6845')
-
-build() {
- cd "${srcdir}"/ffms-${pkgver}-src
-
-# Patch
- patch -Np1 -i "${srcdir}"/autoconf.patch
- patch -Np1 -i "${srcdir}"/ffmpeg.patch
- mv configure.in configure.ac
-
-# Build
- ./autogen.sh --prefix=/usr --enable-shared --disable-static
- make
-}
-
-package() {
- cd "${srcdir}"/ffms-${pkgver}-src
-
-# Install
- make DESTDIR="${pkgdir}" install
-
-# License
- install -dm 755 "${pkgdir}"/usr/share/licenses/ffmpegsource
- install -m 644 COPYING "${pkgdir}"/usr/share/licenses/ffmpegsource/LICENSE
-}
-
-# vim: ts=2 sw=2 et:
Copied: ffmpegsource/repos/community-x86_64/PKGBUILD (from rev 84950, ffmpegsource/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-02-26 15:11:09 UTC (rev 84951)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Maxime Gauduin <alucryd at gmail.com>
+
+pkgname=ffmpegsource
+pkgver=743
+pkgrel=1
+pkgdesc="A libav/ffmpeg based source library and Avisynth plugin for easy frame accurate access"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/ffmpegsource/"
+license=('MIT')
+depends=('ffmpeg')
+makedepends=('svn')
+options=('!libtool')
+source=('autoconf.patch')
+sha256sums=('b09a7e9a08a16bdaf19d43c7ad8d3ec455f6fecec2f4f5ada417345343adda93')
+
+_svntrunk=http://ffmpegsource.googlecode.com/svn/trunk/
+_svnmod=ffmpegsource
+
+build() {
+ cd "${srcdir}"
+ msg "Connecting to SVN server...."
+
+ if [[ -d ${_svnmod}/.svn ]]; then
+ (cd ${_svnmod} && svn up -r ${pkgver})
+ else
+ svn co ${_svntrunk} --config-dir ./ -r ${pkgver} ${_svnmod}
+ fi
+
+ msg "SVN checkout done or server timeout"
+ msg "Starting build..."
+
+ rm -rf "${srcdir}"/${_svnmod}-build
+ svn export "${srcdir}"/${_svnmod} "${srcdir}"/${_svnmod}-build
+ cd "${srcdir}"/${_svnmod}-build
+
+# Patch
+ patch -Np1 -i "${srcdir}"/autoconf.patch
+
+# Build
+ ./autogen.sh --prefix=/usr --enable-shared --disable-static
+ make
+}
+
+package() {
+ cd "${srcdir}"/${_svnmod}-build
+
+# Install
+ make DESTDIR="${pkgdir}" install
+
+# License
+ install -dm 755 "${pkgdir}"/usr/share/licenses/ffmpegsource
+ install -m 644 COPYING "${pkgdir}"/usr/share/licenses/ffmpegsource/LICENSE
+}
+
+# vim: ts=2 sw=2 et:
Deleted: community-x86_64/autoconf.patch
===================================================================
--- community-x86_64/autoconf.patch 2013-02-26 15:08:55 UTC (rev 84950)
+++ community-x86_64/autoconf.patch 2013-02-26 15:11:09 UTC (rev 84951)
@@ -1,22 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -6,7 +6,7 @@ pkgconfig_DATA = ffms2.pc
-
- dist_doc_DATA = doc/ffms2-api.html doc/ffms2-changelog.html doc/style.css
-
--INCLUDES = -I. -I$(top_srcdir)/include -I$(top_srcdir)/src/config @LIBAV_CFLAGS@ @ZLIB_CPPFLAGS@ -include config.h
-+AM_CPPFLAGS = -I. -I$(top_srcdir)/include -I$(top_srcdir)/src/config @LIBAV_CFLAGS@ @ZLIB_CPPFLAGS@ -include config.h
-
- lib_LTLIBRARIES = src/core/libffms2.la
- src_core_libffms2_la_LIBADD = @LIBAV_LIBS@ @ZLIB_LDFLAGS@ -lz @LTUNDEF@
---- a/configure.in
-+++ b/configure.in
-@@ -30,7 +30,7 @@ if test -z "$CXXFLAGS"; then
- CXXFLAGS="$OPT_FLAGS"
- fi
-
--AM_CONFIG_HEADER([src/config/config.h])
-+AC_CONFIG_HEADERS([src/config/config.h])
- AC_PROG_CC
- AC_PROG_CXX
- LT_INIT([static disable-shared])
Copied: ffmpegsource/repos/community-x86_64/autoconf.patch (from rev 84950, ffmpegsource/trunk/autoconf.patch)
===================================================================
--- community-x86_64/autoconf.patch (rev 0)
+++ community-x86_64/autoconf.patch 2013-02-26 15:11:09 UTC (rev 84951)
@@ -0,0 +1,22 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -6,7 +6,7 @@ pkgconfig_DATA = ffms2.pc
+
+ dist_doc_DATA = doc/ffms2-api.html doc/ffms2-changelog.html doc/style.css
+
+-INCLUDES = -I. -I$(top_srcdir)/include -I$(top_srcdir)/src/config @LIBAV_CFLAGS@ @ZLIB_CPPFLAGS@ -include config.h
++AM_CPPFLAGS = -I. -I$(top_srcdir)/include -I$(top_srcdir)/src/config @LIBAV_CFLAGS@ @ZLIB_CPPFLAGS@ -include config.h
+
+ lib_LTLIBRARIES = src/core/libffms2.la
+ src_core_libffms2_la_LIBADD = @LIBAV_LIBS@ @ZLIB_LDFLAGS@ -lz @LTUNDEF@
+--- a/configure.ac
++++ b/configure.ac
+@@ -30,7 +30,7 @@ if test -z "$CXXFLAGS"; then
+ CXXFLAGS="$OPT_FLAGS"
+ fi
+
+-AM_CONFIG_HEADER([src/config/config.h])
++AC_CONFIG_HEADERS([src/config/config.h])
+ AC_PROG_CC
+ AC_PROG_CXX
+ LT_INIT([static disable-shared])
Deleted: community-x86_64/ffmpeg.patch
===================================================================
--- community-x86_64/ffmpeg.patch 2013-02-26 15:08:55 UTC (rev 84950)
+++ community-x86_64/ffmpeg.patch 2013-02-26 15:11:09 UTC (rev 84951)
@@ -1,89 +0,0 @@
---- ffms-2.17-src.orig/configure.in
-+++ ffms-2.17-src/configure.in
-@@ -135,7 +135,7 @@ AC_DEFUN([TEST_LIBAV],
- #include <libavcodec/avcodec.h>
- #include <libswscale/swscale.h>
- ]],[[
-- avcodec_init();
-+ av_register_all();
- swscale_version();
- #ifdef FFMS_USE_FFMPEG_COMPAT
- int bogus = CODEC_ID_G2M;
---- ffms-2.17-src.orig/include/ffmscompat.h
-+++ ffms-2.17-src/include/ffmscompat.h
-@@ -84,6 +84,14 @@
- # else
- # define FFMS_CALCULATE_DELAY (CodecContext->has_b_frames + (CodecContext->thread_count - 1))
- # endif
-+# if VERSION_CHECK(LIBAVCODEC_VERSION_INT, <, 54, 25, 0, 54, 51, 100)
-+# define FFMS_ID(x) (CODEC_ID_##x)
-+# define FFMS_CodecID CodecID
-+# else
-+# define FFMS_ID(x) (AV_CODEC_ID_##x)
-+# define FFMS_CodecID AVCodecID
-+# undef CodecID
-+# endif
- #endif
-
- #ifdef LIBAVUTIL_VERSION_INT
---- ffms-2.17-src.orig/src/core/codectype.cpp
-+++ ffms-2.17-src/src/core/codectype.cpp
-@@ -25,7 +25,7 @@
-
- typedef struct CodecTags {
- char str[20];
-- CodecID id;
-+ FFMS_CodecID id;
- } CodecTags;
-
- static const CodecTags mkv_codec_tags[] = {
-@@ -92,7 +92,7 @@ static const CodecTags mkv_codec_tags[]
- };
-
- typedef struct AVCodecTag {
-- enum CodecID id;
-+ enum FFMS_CodecID id;
- unsigned int tag;
- } AVCodecTag;
-
-@@ -400,7 +400,7 @@ const char *GetLAVCSampleFormatName(AVSa
- }
- }
-
--CodecID MatroskaToFFCodecID(char *Codec, void *CodecPrivate, unsigned int FourCC, unsigned int BitsPerSample) {
-+FFMS_CodecID MatroskaToFFCodecID(char *Codec, void *CodecPrivate, unsigned int FourCC, unsigned int BitsPerSample) {
- /* Look up native codecs */
- for(int i = 0; mkv_codec_tags[i].id != CODEC_ID_NONE; i++){
- if(!strncmp(mkv_codec_tags[i].str, Codec,
-@@ -408,7 +408,7 @@ CodecID MatroskaToFFCodecID(char *Codec,
-
- // Uncompressed and exotic format fixup
- // This list is incomplete
-- CodecID CID = mkv_codec_tags[i].id;
-+ FFMS_CodecID CID = mkv_codec_tags[i].id;
- switch (CID) {
- case CODEC_ID_PCM_S16LE:
- switch (BitsPerSample) {
---- ffms-2.17-src.orig/src/core/codectype.h
-+++ ffms-2.17-src/src/core/codectype.h
-@@ -27,5 +27,5 @@ extern "C" {
- #include "ffmscompat.h"
-
- FFMS_TrackType HaaliTrackTypeToFFTrackType(int TT);
--CodecID MatroskaToFFCodecID(char *Codec, void *CodecPrivate, unsigned int FourCC = 0, unsigned int BitsPerSample = 0);
-+FFMS_CodecID MatroskaToFFCodecID(char *Codec, void *CodecPrivate, unsigned int FourCC = 0, unsigned int BitsPerSample = 0);
- const char *GetLAVCSampleFormatName(AVSampleFormat s);
---- ffms-2.17-src.orig/src/core/matroskaparser.h
-+++ ffms-2.17-src/src/core/matroskaparser.h
-@@ -32,6 +32,11 @@
- #ifndef MATROSKA_PARSER_H
- #define MATROSKA_PARSER_H
-
-+/* Make sure we undefine CodecID, since libavcodec defines it as AVCodec ID */
-+#ifdef CodecID
-+#undef CodecID
-+#endif
-+
- /* Random notes:
- *
- * The parser does not process frame data in any way and does not read it into
More information about the arch-commits
mailing list