[arch-commits] Commit in bmp-wma/repos (8 files)
Pierre Schmitz
pierre at archlinux.org
Sat Sep 10 14:26:41 UTC 2011
Date: Saturday, September 10, 2011 @ 10:26:41
Author: pierre
Revision: 137730
archrelease: copy trunk to extra-x86_64, extra-i686
Added:
bmp-wma/repos/extra-i686/PKGBUILD
(from rev 137729, bmp-wma/trunk/PKGBUILD)
bmp-wma/repos/extra-i686/bmp-wma-gcc4.patch
(from rev 137729, bmp-wma/trunk/bmp-wma-gcc4.patch)
bmp-wma/repos/extra-x86_64/PKGBUILD
(from rev 137729, bmp-wma/trunk/PKGBUILD)
bmp-wma/repos/extra-x86_64/bmp-wma-gcc4.patch
(from rev 137729, bmp-wma/trunk/bmp-wma-gcc4.patch)
Deleted:
bmp-wma/repos/extra-i686/PKGBUILD
bmp-wma/repos/extra-i686/bmp-wma-gcc4.patch
bmp-wma/repos/extra-x86_64/PKGBUILD
bmp-wma/repos/extra-x86_64/bmp-wma-gcc4.patch
---------------------------------+
extra-i686/PKGBUILD | 64 ++++++------
extra-i686/bmp-wma-gcc4.patch | 196 +++++++++++++++++++-------------------
extra-x86_64/PKGBUILD | 64 ++++++------
extra-x86_64/bmp-wma-gcc4.patch | 196 +++++++++++++++++++-------------------
4 files changed, 264 insertions(+), 256 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2011-09-10 14:25:52 UTC (rev 137729)
+++ extra-i686/PKGBUILD 2011-09-10 14:26:41 UTC (rev 137730)
@@ -1,30 +0,0 @@
-# $Id$
-# Maintainer: Kevin Piche <kevin at archlinux.org>
-# Contributor: Ewoud Nuyts <ewoud.nuyts at gmail.com>
-
-pkgname=bmp-wma
-pkgver=0.1.1
-pkgrel=3
-pkgdesc="WMA plugin for Beep Media Player"
-url="http://bmp-plugins.berlios.de/novelian/project.php?p=bmp-wma"
-license=('GPL')
-arch=('x86_64' 'i686')
-depends=('bmp')
-groups=('bmp-plugins' 'bmp-io-plugins')
-options=(!libtool !emptydirs)
-source=(http://download.berlios.de/bmp-plugins/${pkgname}-${pkgver}.tar.gz
- bmp-wma-gcc4.patch)
-md5sums=('8dcf3fcdb10e8e2e386f70745812412b'
- '730eba8f41e989dd8b56c18bcc826cc4')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np0 -i "${srcdir}/bmp-wma-gcc4.patch" || return 1
- if [ "${CARCH}" = "x86_64" ]; then
- export CFLAGS="${CFLAGS} -fPIC"
- fi
- ./configure --prefix=/usr --disable-static || return 1
- echo '#define HAVE_LRINTF 1' >> config.h
- make || return 1
- make DESTDIR="${pkgdir}" install || return 1
-}
Copied: bmp-wma/repos/extra-i686/PKGBUILD (from rev 137729, bmp-wma/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-09-10 14:26:41 UTC (rev 137730)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Kevin Piche <kevin at archlinux.org>
+# Contributor: Ewoud Nuyts <ewoud.nuyts at gmail.com>
+
+pkgname=bmp-wma
+pkgver=0.1.1
+pkgrel=4
+pkgdesc="WMA plugin for Beep Media Player"
+url="http://bmp-plugins.berlios.de/novelian/project.php?p=bmp-wma"
+license=('GPL')
+arch=('x86_64' 'i686')
+depends=('bmp')
+groups=('bmp-plugins' 'bmp-io-plugins')
+options=('!libtool' '!emptydirs')
+source=("http://download.berlios.de/bmp-plugins/${pkgname}-${pkgver}.tar.gz"
+ 'bmp-wma-gcc4.patch')
+md5sums=('8dcf3fcdb10e8e2e386f70745812412b'
+ '730eba8f41e989dd8b56c18bcc826cc4')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np0 -i "${srcdir}/bmp-wma-gcc4.patch"
+ if [ "${CARCH}" = "x86_64" ]; then
+ export CFLAGS="${CFLAGS} -fPIC"
+ fi
+ ./configure --prefix=/usr --disable-static
+ echo '#define HAVE_LRINTF 1' >> config.h
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-i686/bmp-wma-gcc4.patch
===================================================================
--- extra-i686/bmp-wma-gcc4.patch 2011-09-10 14:25:52 UTC (rev 137729)
+++ extra-i686/bmp-wma-gcc4.patch 2011-09-10 14:26:41 UTC (rev 137730)
@@ -1,98 +0,0 @@
---- src/libffwma/avcodec.h.orig 2005-10-07 11:49:36.000000000 -0400
-+++ src/libffwma/avcodec.h 2005-10-07 11:51:09.000000000 -0400
-@@ -11,6 +11,43 @@
- extern "C" {
- #endif
-
-+
-+/**
-+ * AVOption.
-+ */
-+typedef struct AVOption {
-+ /** options' name */
-+ const char *name; /* if name is NULL, it indicates a link to next */
-+ /** short English text help or const struct AVOption* subpointer */
-+ const char *help; // const struct AVOption* sub;
-+ /** offset to context structure where the parsed value should be stored */
-+ int offset;
-+ /** options' type */
-+ int type;
-+#define FF_OPT_TYPE_BOOL 1 ///< boolean - true,1,on (or simply presence)
-+#define FF_OPT_TYPE_DOUBLE 2 ///< double
-+#define FF_OPT_TYPE_INT 3 ///< integer
-+#define FF_OPT_TYPE_STRING 4 ///< string (finished with \0)
-+#define FF_OPT_TYPE_MASK 0x1f ///< mask for types - upper bits are various flags
-+//#define FF_OPT_TYPE_EXPERT 0x20 // flag for expert option
-+#define FF_OPT_TYPE_FLAG (FF_OPT_TYPE_BOOL | 0x40)
-+#define FF_OPT_TYPE_RCOVERRIDE (FF_OPT_TYPE_STRING | 0x80)
-+ /** min value (min == max -> no limits) */
-+ double min;
-+ /** maximum value for double/int */
-+ double max;
-+ /** default boo [0,1]l/double/int value */
-+ double defval;
-+ /**
-+ * default string value (with optional semicolon delimited extra option-list
-+ * i.e. option1;option2;option3
-+ * defval might select other then first argument as default
-+ */
-+ const char *defstr;
-+#define FF_OPT_MAX_DEPTH 10
-+} AVOption;
-+
-+
- #include "common.h"
- #include <sys/types.h> /* size_t */
-
-@@ -1396,41 +1433,6 @@
-
-
- /**
-- * AVOption.
-- */
--typedef struct AVOption {
-- /** options' name */
-- const char *name; /* if name is NULL, it indicates a link to next */
-- /** short English text help or const struct AVOption* subpointer */
-- const char *help; // const struct AVOption* sub;
-- /** offset to context structure where the parsed value should be stored */
-- int offset;
-- /** options' type */
-- int type;
--#define FF_OPT_TYPE_BOOL 1 ///< boolean - true,1,on (or simply presence)
--#define FF_OPT_TYPE_DOUBLE 2 ///< double
--#define FF_OPT_TYPE_INT 3 ///< integer
--#define FF_OPT_TYPE_STRING 4 ///< string (finished with \0)
--#define FF_OPT_TYPE_MASK 0x1f ///< mask for types - upper bits are various flags
--//#define FF_OPT_TYPE_EXPERT 0x20 // flag for expert option
--#define FF_OPT_TYPE_FLAG (FF_OPT_TYPE_BOOL | 0x40)
--#define FF_OPT_TYPE_RCOVERRIDE (FF_OPT_TYPE_STRING | 0x80)
-- /** min value (min == max -> no limits) */
-- double min;
-- /** maximum value for double/int */
-- double max;
-- /** default boo [0,1]l/double/int value */
-- double defval;
-- /**
-- * default string value (with optional semicolon delimited extra option-list
-- * i.e. option1;option2;option3
-- * defval might select other then first argument as default
-- */
-- const char *defstr;
--#define FF_OPT_MAX_DEPTH 10
--} AVOption;
--
--/**
- * Parse option(s) and sets fields in passed structure
- * @param strct structure where the parsed results will be written
- * @param list list with AVOptions
---- src/libffwma/dsputil.h.orig 2005-10-07 11:51:59.000000000 -0400
-+++ src/libffwma/dsputil.h 2005-10-07 11:52:17.000000000 -0400
-@@ -28,7 +28,6 @@
- #ifndef DSPUTIL_H
- #define DSPUTIL_H
-
--#include "common.h"
- #include "avcodec.h"
-
-
Copied: bmp-wma/repos/extra-i686/bmp-wma-gcc4.patch (from rev 137729, bmp-wma/trunk/bmp-wma-gcc4.patch)
===================================================================
--- extra-i686/bmp-wma-gcc4.patch (rev 0)
+++ extra-i686/bmp-wma-gcc4.patch 2011-09-10 14:26:41 UTC (rev 137730)
@@ -0,0 +1,98 @@
+--- src/libffwma/avcodec.h.orig 2005-10-07 11:49:36.000000000 -0400
++++ src/libffwma/avcodec.h 2005-10-07 11:51:09.000000000 -0400
+@@ -11,6 +11,43 @@
+ extern "C" {
+ #endif
+
++
++/**
++ * AVOption.
++ */
++typedef struct AVOption {
++ /** options' name */
++ const char *name; /* if name is NULL, it indicates a link to next */
++ /** short English text help or const struct AVOption* subpointer */
++ const char *help; // const struct AVOption* sub;
++ /** offset to context structure where the parsed value should be stored */
++ int offset;
++ /** options' type */
++ int type;
++#define FF_OPT_TYPE_BOOL 1 ///< boolean - true,1,on (or simply presence)
++#define FF_OPT_TYPE_DOUBLE 2 ///< double
++#define FF_OPT_TYPE_INT 3 ///< integer
++#define FF_OPT_TYPE_STRING 4 ///< string (finished with \0)
++#define FF_OPT_TYPE_MASK 0x1f ///< mask for types - upper bits are various flags
++//#define FF_OPT_TYPE_EXPERT 0x20 // flag for expert option
++#define FF_OPT_TYPE_FLAG (FF_OPT_TYPE_BOOL | 0x40)
++#define FF_OPT_TYPE_RCOVERRIDE (FF_OPT_TYPE_STRING | 0x80)
++ /** min value (min == max -> no limits) */
++ double min;
++ /** maximum value for double/int */
++ double max;
++ /** default boo [0,1]l/double/int value */
++ double defval;
++ /**
++ * default string value (with optional semicolon delimited extra option-list
++ * i.e. option1;option2;option3
++ * defval might select other then first argument as default
++ */
++ const char *defstr;
++#define FF_OPT_MAX_DEPTH 10
++} AVOption;
++
++
+ #include "common.h"
+ #include <sys/types.h> /* size_t */
+
+@@ -1396,41 +1433,6 @@
+
+
+ /**
+- * AVOption.
+- */
+-typedef struct AVOption {
+- /** options' name */
+- const char *name; /* if name is NULL, it indicates a link to next */
+- /** short English text help or const struct AVOption* subpointer */
+- const char *help; // const struct AVOption* sub;
+- /** offset to context structure where the parsed value should be stored */
+- int offset;
+- /** options' type */
+- int type;
+-#define FF_OPT_TYPE_BOOL 1 ///< boolean - true,1,on (or simply presence)
+-#define FF_OPT_TYPE_DOUBLE 2 ///< double
+-#define FF_OPT_TYPE_INT 3 ///< integer
+-#define FF_OPT_TYPE_STRING 4 ///< string (finished with \0)
+-#define FF_OPT_TYPE_MASK 0x1f ///< mask for types - upper bits are various flags
+-//#define FF_OPT_TYPE_EXPERT 0x20 // flag for expert option
+-#define FF_OPT_TYPE_FLAG (FF_OPT_TYPE_BOOL | 0x40)
+-#define FF_OPT_TYPE_RCOVERRIDE (FF_OPT_TYPE_STRING | 0x80)
+- /** min value (min == max -> no limits) */
+- double min;
+- /** maximum value for double/int */
+- double max;
+- /** default boo [0,1]l/double/int value */
+- double defval;
+- /**
+- * default string value (with optional semicolon delimited extra option-list
+- * i.e. option1;option2;option3
+- * defval might select other then first argument as default
+- */
+- const char *defstr;
+-#define FF_OPT_MAX_DEPTH 10
+-} AVOption;
+-
+-/**
+ * Parse option(s) and sets fields in passed structure
+ * @param strct structure where the parsed results will be written
+ * @param list list with AVOptions
+--- src/libffwma/dsputil.h.orig 2005-10-07 11:51:59.000000000 -0400
++++ src/libffwma/dsputil.h 2005-10-07 11:52:17.000000000 -0400
+@@ -28,7 +28,6 @@
+ #ifndef DSPUTIL_H
+ #define DSPUTIL_H
+
+-#include "common.h"
+ #include "avcodec.h"
+
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2011-09-10 14:25:52 UTC (rev 137729)
+++ extra-x86_64/PKGBUILD 2011-09-10 14:26:41 UTC (rev 137730)
@@ -1,30 +0,0 @@
-# $Id$
-# Maintainer: Kevin Piche <kevin at archlinux.org>
-# Contributor: Ewoud Nuyts <ewoud.nuyts at gmail.com>
-
-pkgname=bmp-wma
-pkgver=0.1.1
-pkgrel=3
-pkgdesc="WMA plugin for Beep Media Player"
-url="http://bmp-plugins.berlios.de/novelian/project.php?p=bmp-wma"
-license=('GPL')
-arch=('x86_64' 'i686')
-depends=('bmp')
-groups=('bmp-plugins' 'bmp-io-plugins')
-options=(!libtool !emptydirs)
-source=(http://download.berlios.de/bmp-plugins/${pkgname}-${pkgver}.tar.gz
- bmp-wma-gcc4.patch)
-md5sums=('8dcf3fcdb10e8e2e386f70745812412b'
- '730eba8f41e989dd8b56c18bcc826cc4')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np0 -i "${srcdir}/bmp-wma-gcc4.patch" || return 1
- if [ "${CARCH}" = "x86_64" ]; then
- export CFLAGS="${CFLAGS} -fPIC"
- fi
- ./configure --prefix=/usr --disable-static || return 1
- echo '#define HAVE_LRINTF 1' >> config.h
- make || return 1
- make DESTDIR="${pkgdir}" install || return 1
-}
Copied: bmp-wma/repos/extra-x86_64/PKGBUILD (from rev 137729, bmp-wma/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2011-09-10 14:26:41 UTC (rev 137730)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Kevin Piche <kevin at archlinux.org>
+# Contributor: Ewoud Nuyts <ewoud.nuyts at gmail.com>
+
+pkgname=bmp-wma
+pkgver=0.1.1
+pkgrel=4
+pkgdesc="WMA plugin for Beep Media Player"
+url="http://bmp-plugins.berlios.de/novelian/project.php?p=bmp-wma"
+license=('GPL')
+arch=('x86_64' 'i686')
+depends=('bmp')
+groups=('bmp-plugins' 'bmp-io-plugins')
+options=('!libtool' '!emptydirs')
+source=("http://download.berlios.de/bmp-plugins/${pkgname}-${pkgver}.tar.gz"
+ 'bmp-wma-gcc4.patch')
+md5sums=('8dcf3fcdb10e8e2e386f70745812412b'
+ '730eba8f41e989dd8b56c18bcc826cc4')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np0 -i "${srcdir}/bmp-wma-gcc4.patch"
+ if [ "${CARCH}" = "x86_64" ]; then
+ export CFLAGS="${CFLAGS} -fPIC"
+ fi
+ ./configure --prefix=/usr --disable-static
+ echo '#define HAVE_LRINTF 1' >> config.h
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-x86_64/bmp-wma-gcc4.patch
===================================================================
--- extra-x86_64/bmp-wma-gcc4.patch 2011-09-10 14:25:52 UTC (rev 137729)
+++ extra-x86_64/bmp-wma-gcc4.patch 2011-09-10 14:26:41 UTC (rev 137730)
@@ -1,98 +0,0 @@
---- src/libffwma/avcodec.h.orig 2005-10-07 11:49:36.000000000 -0400
-+++ src/libffwma/avcodec.h 2005-10-07 11:51:09.000000000 -0400
-@@ -11,6 +11,43 @@
- extern "C" {
- #endif
-
-+
-+/**
-+ * AVOption.
-+ */
-+typedef struct AVOption {
-+ /** options' name */
-+ const char *name; /* if name is NULL, it indicates a link to next */
-+ /** short English text help or const struct AVOption* subpointer */
-+ const char *help; // const struct AVOption* sub;
-+ /** offset to context structure where the parsed value should be stored */
-+ int offset;
-+ /** options' type */
-+ int type;
-+#define FF_OPT_TYPE_BOOL 1 ///< boolean - true,1,on (or simply presence)
-+#define FF_OPT_TYPE_DOUBLE 2 ///< double
-+#define FF_OPT_TYPE_INT 3 ///< integer
-+#define FF_OPT_TYPE_STRING 4 ///< string (finished with \0)
-+#define FF_OPT_TYPE_MASK 0x1f ///< mask for types - upper bits are various flags
-+//#define FF_OPT_TYPE_EXPERT 0x20 // flag for expert option
-+#define FF_OPT_TYPE_FLAG (FF_OPT_TYPE_BOOL | 0x40)
-+#define FF_OPT_TYPE_RCOVERRIDE (FF_OPT_TYPE_STRING | 0x80)
-+ /** min value (min == max -> no limits) */
-+ double min;
-+ /** maximum value for double/int */
-+ double max;
-+ /** default boo [0,1]l/double/int value */
-+ double defval;
-+ /**
-+ * default string value (with optional semicolon delimited extra option-list
-+ * i.e. option1;option2;option3
-+ * defval might select other then first argument as default
-+ */
-+ const char *defstr;
-+#define FF_OPT_MAX_DEPTH 10
-+} AVOption;
-+
-+
- #include "common.h"
- #include <sys/types.h> /* size_t */
-
-@@ -1396,41 +1433,6 @@
-
-
- /**
-- * AVOption.
-- */
--typedef struct AVOption {
-- /** options' name */
-- const char *name; /* if name is NULL, it indicates a link to next */
-- /** short English text help or const struct AVOption* subpointer */
-- const char *help; // const struct AVOption* sub;
-- /** offset to context structure where the parsed value should be stored */
-- int offset;
-- /** options' type */
-- int type;
--#define FF_OPT_TYPE_BOOL 1 ///< boolean - true,1,on (or simply presence)
--#define FF_OPT_TYPE_DOUBLE 2 ///< double
--#define FF_OPT_TYPE_INT 3 ///< integer
--#define FF_OPT_TYPE_STRING 4 ///< string (finished with \0)
--#define FF_OPT_TYPE_MASK 0x1f ///< mask for types - upper bits are various flags
--//#define FF_OPT_TYPE_EXPERT 0x20 // flag for expert option
--#define FF_OPT_TYPE_FLAG (FF_OPT_TYPE_BOOL | 0x40)
--#define FF_OPT_TYPE_RCOVERRIDE (FF_OPT_TYPE_STRING | 0x80)
-- /** min value (min == max -> no limits) */
-- double min;
-- /** maximum value for double/int */
-- double max;
-- /** default boo [0,1]l/double/int value */
-- double defval;
-- /**
-- * default string value (with optional semicolon delimited extra option-list
-- * i.e. option1;option2;option3
-- * defval might select other then first argument as default
-- */
-- const char *defstr;
--#define FF_OPT_MAX_DEPTH 10
--} AVOption;
--
--/**
- * Parse option(s) and sets fields in passed structure
- * @param strct structure where the parsed results will be written
- * @param list list with AVOptions
---- src/libffwma/dsputil.h.orig 2005-10-07 11:51:59.000000000 -0400
-+++ src/libffwma/dsputil.h 2005-10-07 11:52:17.000000000 -0400
-@@ -28,7 +28,6 @@
- #ifndef DSPUTIL_H
- #define DSPUTIL_H
-
--#include "common.h"
- #include "avcodec.h"
-
-
Copied: bmp-wma/repos/extra-x86_64/bmp-wma-gcc4.patch (from rev 137729, bmp-wma/trunk/bmp-wma-gcc4.patch)
===================================================================
--- extra-x86_64/bmp-wma-gcc4.patch (rev 0)
+++ extra-x86_64/bmp-wma-gcc4.patch 2011-09-10 14:26:41 UTC (rev 137730)
@@ -0,0 +1,98 @@
+--- src/libffwma/avcodec.h.orig 2005-10-07 11:49:36.000000000 -0400
++++ src/libffwma/avcodec.h 2005-10-07 11:51:09.000000000 -0400
+@@ -11,6 +11,43 @@
+ extern "C" {
+ #endif
+
++
++/**
++ * AVOption.
++ */
++typedef struct AVOption {
++ /** options' name */
++ const char *name; /* if name is NULL, it indicates a link to next */
++ /** short English text help or const struct AVOption* subpointer */
++ const char *help; // const struct AVOption* sub;
++ /** offset to context structure where the parsed value should be stored */
++ int offset;
++ /** options' type */
++ int type;
++#define FF_OPT_TYPE_BOOL 1 ///< boolean - true,1,on (or simply presence)
++#define FF_OPT_TYPE_DOUBLE 2 ///< double
++#define FF_OPT_TYPE_INT 3 ///< integer
++#define FF_OPT_TYPE_STRING 4 ///< string (finished with \0)
++#define FF_OPT_TYPE_MASK 0x1f ///< mask for types - upper bits are various flags
++//#define FF_OPT_TYPE_EXPERT 0x20 // flag for expert option
++#define FF_OPT_TYPE_FLAG (FF_OPT_TYPE_BOOL | 0x40)
++#define FF_OPT_TYPE_RCOVERRIDE (FF_OPT_TYPE_STRING | 0x80)
++ /** min value (min == max -> no limits) */
++ double min;
++ /** maximum value for double/int */
++ double max;
++ /** default boo [0,1]l/double/int value */
++ double defval;
++ /**
++ * default string value (with optional semicolon delimited extra option-list
++ * i.e. option1;option2;option3
++ * defval might select other then first argument as default
++ */
++ const char *defstr;
++#define FF_OPT_MAX_DEPTH 10
++} AVOption;
++
++
+ #include "common.h"
+ #include <sys/types.h> /* size_t */
+
+@@ -1396,41 +1433,6 @@
+
+
+ /**
+- * AVOption.
+- */
+-typedef struct AVOption {
+- /** options' name */
+- const char *name; /* if name is NULL, it indicates a link to next */
+- /** short English text help or const struct AVOption* subpointer */
+- const char *help; // const struct AVOption* sub;
+- /** offset to context structure where the parsed value should be stored */
+- int offset;
+- /** options' type */
+- int type;
+-#define FF_OPT_TYPE_BOOL 1 ///< boolean - true,1,on (or simply presence)
+-#define FF_OPT_TYPE_DOUBLE 2 ///< double
+-#define FF_OPT_TYPE_INT 3 ///< integer
+-#define FF_OPT_TYPE_STRING 4 ///< string (finished with \0)
+-#define FF_OPT_TYPE_MASK 0x1f ///< mask for types - upper bits are various flags
+-//#define FF_OPT_TYPE_EXPERT 0x20 // flag for expert option
+-#define FF_OPT_TYPE_FLAG (FF_OPT_TYPE_BOOL | 0x40)
+-#define FF_OPT_TYPE_RCOVERRIDE (FF_OPT_TYPE_STRING | 0x80)
+- /** min value (min == max -> no limits) */
+- double min;
+- /** maximum value for double/int */
+- double max;
+- /** default boo [0,1]l/double/int value */
+- double defval;
+- /**
+- * default string value (with optional semicolon delimited extra option-list
+- * i.e. option1;option2;option3
+- * defval might select other then first argument as default
+- */
+- const char *defstr;
+-#define FF_OPT_MAX_DEPTH 10
+-} AVOption;
+-
+-/**
+ * Parse option(s) and sets fields in passed structure
+ * @param strct structure where the parsed results will be written
+ * @param list list with AVOptions
+--- src/libffwma/dsputil.h.orig 2005-10-07 11:51:59.000000000 -0400
++++ src/libffwma/dsputil.h 2005-10-07 11:52:17.000000000 -0400
+@@ -28,7 +28,6 @@
+ #ifndef DSPUTIL_H
+ #define DSPUTIL_H
+
+-#include "common.h"
+ #include "avcodec.h"
+
+
More information about the arch-commits
mailing list