[gentoo-commits] repo/gentoo:master commit in: net-libs/opal/, net-libs/opal/files/

[Mikle Kolyada]

commit: d4ef818a779bdc728998928832c4606a8a5fbe8d
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Jan 26 22:54:51 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Jan 26 22:54:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4ef818a

net-libs/opal: remove last rited package

 net-libs/opal/Manifest |   2 -
 net-libs/opal/files/opal-3.10.10-ffmpeg2-1.patch   | 396 -
 .../opal-3.10.9-disable-h323-workaround.patch  |  13 -
 .../files/opal-3.10.9-java-ruby-swig-fix.patch |  29 --
 net-libs/opal/metadata.xml |  39 --
 net-libs/opal/opal-3.10.11-r1.ebuild   | 252 -
 6 files changed, 731 deletions(-)

diff --git a/net-libs/opal/Manifest b/net-libs/opal/Manifest
deleted file mode 100644
index 5505ed7fc31..000
--- a/net-libs/opal/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST opal-3.10.11-htmldoc.tar.bz2 2944338 BLAKE2B 
3e686809a217c13718e3e777a5c11b92b1405d5421b882abc50a3e231db28d72099e7383fa23bf130cc5fa2bf123412702248054cfa7be14dcbc999fd3bd1248
 SHA512 
6075487344d4cfa5c2e2219376e3eccd98028475eac6f89d20d24d611a8806a27eb354ce8e77e16c620c8cb3d398b9502082f3fe8f67763d3f67feea835819b5
-DIST opal-3.10.11.tar.bz2 8590616 BLAKE2B 
1ea56285315e879d85190db4e2b2fa814cf0fc7825db80547d1fde978f6d24a8e2cd853575a4c13dbfc7d8dada422a90ab95512a367a87de6d13889a6d8f8ca4
 SHA512 
970745375e7ebb29178ce9d0bc29254e69dd952e5f754038979a8613489a26f0fb68d63ec2709ffa1964e50fe9cfde874489f683a451d83e7a075d62d9228fa1

diff --git a/net-libs/opal/files/opal-3.10.10-ffmpeg2-1.patch 
b/net-libs/opal/files/opal-3.10.10-ffmpeg2-1.patch
deleted file mode 100644
index 6b58ac28f3d..000
--- a/net-libs/opal/files/opal-3.10.10-ffmpeg2-1.patch
+++ /dev/null
@@ -1,396 +0,0 @@
-Submitted By:Igor Živković 
-Date:2013-10-08
-Initial Package Version: 3.10.10
-Upstream Status: Unknown
-Origin:  Gentoo
-Description: Fixes building against FFmpeg version >= 2.0.0
-
-diff -Naur opal-3.10.10.orig/plugins/video/common/dyna.cxx 
opal-3.10.10/plugins/video/common/dyna.cxx
 opal-3.10.10.orig/plugins/video/common/dyna.cxx2013-02-20 
03:18:05.0 +0100
-+++ opal-3.10.10/plugins/video/common/dyna.cxx 2013-10-08 12:57:25.058873513 
+0200
-@@ -210,7 +210,7 @@
- #endif
- 
- 
--FFMPEGLibrary::FFMPEGLibrary(CodecID codec)
-+FFMPEGLibrary::FFMPEGLibrary(AVCodecID codec)
- {
-   m_codec = codec;
-   if (m_codec==CODEC_ID_H264)
-@@ -348,12 +348,12 @@
-   return true;
- }
- 
--AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum CodecID id)
-+AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum AVCodecID id)
- {
-   return Favcodec_find_encoder(id);
- }
- 
--AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum CodecID id)
-+AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum AVCodecID id)
- {
-   WaitAndSignal m(processLock);
- 
-diff -Naur opal-3.10.10.orig/plugins/video/common/dyna.h 
opal-3.10.10/plugins/video/common/dyna.h
 opal-3.10.10.orig/plugins/video/common/dyna.h  2013-02-20 
03:18:05.0 +0100
-+++ opal-3.10.10/plugins/video/common/dyna.h   2013-10-08 12:57:25.058873513 
+0200
-@@ -88,13 +88,13 @@
- class FFMPEGLibrary 
- {
-   public:
--FFMPEGLibrary(CodecID codec);
-+FFMPEGLibrary(AVCodecID codec);
- ~FFMPEGLibrary();
- 
- bool Load();
- 
--AVCodec *AvcodecFindEncoder(enum CodecID id);
--AVCodec *AvcodecFindDecoder(enum CodecID id);
-+AVCodec *AvcodecFindEncoder(enum AVCodecID id);
-+AVCodec *AvcodecFindDecoder(enum AVCodecID id);
- AVCodecContext *AvcodecAllocContext(void);
- AVFrame *AvcodecAllocFrame(void);
- int AvcodecOpen(AVCodecContext *ctx, AVCodec *codec);
-@@ -117,15 +117,15 @@
- DynaLink m_libAvcodec;
- DynaLink m_libAvutil;
- 
--CodecID m_codec;
-+AVCodecID m_codec;
- char m_codecString[32];
- 
- void (*Favcodec_init)(void);
- void (*Fav_init_packet)(AVPacket *pkt);
- 
- void (*Favcodec_register_all)(void);
--AVCodec *(*Favcodec_find_encoder)(enum CodecID id);
--AVCodec *(*Favcodec_find_decoder)(enum CodecID id);
-+AVCodec *(*Favcodec_find_encoder)(enum AVCodecID id);
-+AVCodec *(*Favcodec_find_decoder)(enum AVCodecID id);
- AVCodecContext *(*Favcodec_alloc_context)(void);
- AVFrame *(*Favcodec_alloc_frame)(void);
- int (*Favcodec_open)(AVCodecContext *ctx, AVCodec *codec);
-diff -Naur opal-3.10.10.orig/plugins/video/common/ffmpeg/libavcodec/avcodec.h 
opal-3.10.10/plugins/video/common/ffmpeg/libavcodec/avcodec.h
 opal-3.10.10.orig/plugins/video/common/ffmpeg/libavcodec/avcodec.h 
2013-02-20 03:18:04.0 +0100
-+++ opal-3.10.10/plugins/video/common/ffmpeg/libavcodec/avcodec.h  
2013-10-08 12:57:25.060873488 +0200
-@@ -101,7 +101,7 @@
-  * 1. no value of a existing codec ID changes (that would break ABI),
-  * 2. it is as close as possible to similar codecs.
-  

[gentoo-commits] repo/gentoo:master commit in: net-libs/opal/, net-libs/opal/files/

[Pacho Ramos]

commit: b540a10f19893a12168b544e4bff4936cb259e56
Author: Pacho Ramos  gentoo  org>
AuthorDate: Fri Jul 14 11:00:41 2017 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Fri Jul 14 11:00:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b540a10f

net-libs/opal: Drop hardmasked versions

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-libs/opal/Manifest |   2 -
 .../files/opal-3.12.4-avoid_cflags_mixup.patch | 132 
 .../files/opal-3.12.4-java-ruby-swig-fix.patch |  28 ---
 net-libs/opal/metadata.xml |   1 -
 net-libs/opal/opal-3.12.4-r1.ebuild| 233 -
 5 files changed, 396 deletions(-)

diff --git a/net-libs/opal/Manifest b/net-libs/opal/Manifest
index 3ac3331..0486da0f5ad 100644
--- a/net-libs/opal/Manifest
+++ b/net-libs/opal/Manifest
@@ -1,4 +1,2 @@
 DIST opal-3.10.11-htmldoc.tar.bz2 2944338 SHA256 
66708e69f1bea6a1160f3aa904643f49b2e2679822c1446d5aeb1f29dd973cea SHA512 
6075487344d4cfa5c2e2219376e3eccd98028475eac6f89d20d24d611a8806a27eb354ce8e77e16c620c8cb3d398b9502082f3fe8f67763d3f67feea835819b5
 WHIRLPOOL 
a23aafd7da85d00db2c285641ab75f1c0850c6e649c8278891282d86312d062be7ac4d89ec3955eac11eb91c018c7b05a89282b35f1b129af90f36e34033
 DIST opal-3.10.11.tar.bz2 8590616 SHA256 
f38e7969e88a28dd9a10a6051315aceecde79d0bbd1a35676868dc5787aed706 SHA512 
970745375e7ebb29178ce9d0bc29254e69dd952e5f754038979a8613489a26f0fb68d63ec2709ffa1964e50fe9cfde874489f683a451d83e7a075d62d9228fa1
 WHIRLPOOL 
b4387f8a664c2763f1e62dc16772ce869dee6d5aaac271ef0013d1e7f207d19c5e3578c26215ce246c278bc4de9aa538dabae8a3b6a794b250a5f30f9be7d206
-DIST opal-3.12.4-htmldoc.tar.bz2 3094840 SHA256 
858cd14bf2de54a6aeb5397d8627a7e50ea6b63e18b0f47c057386d079b07fbc SHA512 
c80ed1b0df9fffbfc07ea590a0e80afd9b985ed2971deb640e92776723f12e6a544eaf3441261d34df0ad0bbca6b03a983f7a7b0b92fbf333f1a8688d2ca735d
 WHIRLPOOL 
e2d5ba8e4429c60003dd995add2aea12b22a2f23da8dd3ed0025fa451752412805d4f25160809542dd8d61684edca35d73174037650b3546cedc97495faa29b9
-DIST opal-3.12.4.tar.bz2 9694052 SHA256 
2786bc27f83c59d74165e318656ada230164ebcba61f0d8cb1b55bfcd13b2d82 SHA512 
83c44dbd077e45a5bf63963b8a5348c24c65e9ab8b25afccacbf4632aa55fce26b6133c8c40f06da90fe73865165509c67b19286e868eada0270adefd3e38733
 WHIRLPOOL 
3063d5b9d64e690898d60e5e26f3936b28b954ce7fb2a2dc2f78cfde05932efc63ec7874dd73c87561d1a3c3f56483789ca031121e7d9fe18c25508042d7

diff --git a/net-libs/opal/files/opal-3.12.4-avoid_cflags_mixup.patch 
b/net-libs/opal/files/opal-3.12.4-avoid_cflags_mixup.patch
deleted file mode 100644
index 24686110a42..000
--- a/net-libs/opal/files/opal-3.12.4-avoid_cflags_mixup.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-diff -urN opal-3.12.4.old/plugins/plugin-inc.mak.in 
opal-3.12.4/plugins/plugin-inc.mak.in
 opal-3.12.4.old/plugins/plugin-inc.mak.in  2013-06-22 21:14:01.528580888 
+0200
-+++ opal-3.12.4/plugins/plugin-inc.mak.in  2013-06-22 21:14:42.652579425 
+0200
-@@ -32,11 +32,13 @@
- CXX   := @CXX@
- INSTALL   := @INSTALL@
- CFLAGS+= @CFLAGS@ -I@prefix@/include -I$(PLUGINDIR)/../include 
-I$(PLUGINDIR)
-+CXXFLAGS  += @CXXFLAGS@ -I@prefix@/include -I$(PLUGINDIR)/../include 
-I$(PLUGINDIR)
- LDFLAGS   += @LDFLAGS@ @LDSO@
- PLUGINEXT :=@PLUGINEXT@
- 
- ifneq ($(DEBUG),)
- CFLAGS+= -g
-+CXXFLAGS  += -g
- endif
- 
- OBJDIR := $(PLUGINDIR)/../lib_@target@/plugins/$(BASENAME)
-@@ -65,11 +67,11 @@
- 
- $(OBJDIR)/%.o : %.cxx
-   @mkdir -p $(OBJDIR) >/dev/null 2>&1
--  $(Q_CC)$(CXX) -c $(CXXFLAGS) $(CFLAGS) -o $@ $<
-+  $(Q_CC)$(CXX) -c $(CXXFLAGS) -o $@ $<
- 
- $(OBJDIR)/%.o : %.cpp
-   @mkdir -p $(OBJDIR) >/dev/null 2>&1
--  $(Q_CC)$(CXX) -c $(CXXFLAGS) $(CFLAGS) -o $@ $<
-+  $(Q_CC)$(CXX) -c $(CXXFLAGS) -o $@ $<
- 
- OBJECTS   = $(addprefix $(OBJDIR)/,$(patsubst %.cxx,%.o,$(patsubst 
%.cpp,%.o,$(patsubst %.c,%.o,$(notdir $(SRCS))
- 
-diff -urN opal-3.12.4.old/plugins/video/H.261-vic/Makefile.in 
opal-3.12.4/plugins/video/H.261-vic/Makefile.in
 opal-3.12.4.old/plugins/video/H.261-vic/Makefile.in2013-06-22 
21:14:01.503580889 +0200
-+++ opal-3.12.4/plugins/video/H.261-vic/Makefile.in2013-06-22 
21:14:42.652579425 +0200
-@@ -39,7 +39,7 @@
-  $(SRCDIR)/bv.c \
- 
- 
--CFLAGS += -I$(COMMONDIR)
-+CXXFLAGS += -I$(COMMONDIR)
- 
- INSTALL_DIR := @VC_PLUGIN_DIR@
- PLUGINDIR   := @PLUGINDIR@
-diff -urN opal-3.12.4.old/plugins/video/H.263-1998/Makefile.in 
opal-3.12.4/plugins/video/H.263-1998/Makefile.in
 opal-3.12.4.old/plugins/video/H.263-1998/Makefile.in   2013-06-22 
21:14:01.499580889 +0200
-+++ opal-3.12.4/plugins/video/H.263-1998/Makefile.in   2013-06-22 
21:16:18.196576026 +0200
-@@ -34,12 +34,12 @@
-  $(COMMONDIR)/ffmpeg.cxx \
-  $(COMMONDIR)/dyna.cxx
- 
--CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
-+CXXFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
- LIBS   += 

[gentoo-commits] repo/gentoo:master commit in: net-libs/opal/, net-libs/opal/files/

[Michael Palimaka]

commit: 9defe9ca14947c28bfc587ce18281beeb858f6e9
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Jun 24 02:13:22 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Jun 24 02:16:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9defe9ca

net-libs/opal: remove old

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 .../opal/files/opal-3.10.11-libav9-gentoo.patch| 262 -
 .../files/opal-3.10.9-avoid_cflags_mixup.patch | 131 ---
 net-libs/opal/files/opal-3.10.9-ffmpeg.patch   | 189 ---
 net-libs/opal/metadata.xml |   1 -
 net-libs/opal/opal-3.10.11.ebuild  | 252 
 5 files changed, 835 deletions(-)

diff --git a/net-libs/opal/files/opal-3.10.11-libav9-gentoo.patch 
b/net-libs/opal/files/opal-3.10.11-libav9-gentoo.patch
deleted file mode 100644
index 6288866262d..000
--- a/net-libs/opal/files/opal-3.10.11-libav9-gentoo.patch
+++ /dev/null
@@ -1,262 +0,0 @@
 plugins/video/common/dyna.cxx
-+++ plugins/video/common/dyna.cxx
-@@ -37,6 +37,7 @@
-  * Craig Southeren (cra...@postincrement.com)
-  * Matthias Schneider (ma30002...@yahoo.de)
-  */
-+#include 
- #include "dyna.h"
- 
- bool DynaLink::Open(const char *name)
-@@ -210,14 +211,14 @@
- #endif
- 
- 
--FFMPEGLibrary::FFMPEGLibrary(CodecID codec)
-+FFMPEGLibrary::FFMPEGLibrary(AVCodecID codec)
- {
-   m_codec = codec;
--  if (m_codec==CODEC_ID_H264)
-+  if (m_codec==AV_CODEC_ID_H264)
-   snprintf( m_codecString, sizeof(m_codecString), "H264");
--  if (m_codec==CODEC_ID_H263P)
-+  if (m_codec==AV_CODEC_ID_H263P)
-   snprintf( m_codecString, sizeof(m_codecString), "H263+");
--  if (m_codec==CODEC_ID_MPEG4)
-+  if (m_codec==AV_CODEC_ID_MPEG4)
-   snprintf( m_codecString, sizeof(m_codecString), "MPEG4");
-   m_isLoadedOK = false;
- }
-@@ -348,12 +349,12 @@
-   return true;
- }
- 
--AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum CodecID id)
-+AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum AVCodecID id)
- {
-   return Favcodec_find_encoder(id);
- }
- 
--AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum CodecID id)
-+AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum AVCodecID id)
- {
-   WaitAndSignal m(processLock);
- 
 plugins/video/common/dyna.h
-+++ plugins/video/common/dyna.h
-@@ -88,13 +88,13 @@
- class FFMPEGLibrary 
- {
-   public:
--FFMPEGLibrary(CodecID codec);
-+FFMPEGLibrary(AVCodecID codec);
- ~FFMPEGLibrary();
- 
- bool Load();
- 
--AVCodec *AvcodecFindEncoder(enum CodecID id);
--AVCodec *AvcodecFindDecoder(enum CodecID id);
-+AVCodec *AvcodecFindEncoder(enum AVCodecID id);
-+AVCodec *AvcodecFindDecoder(enum AVCodecID id);
- AVCodecContext *AvcodecAllocContext(void);
- AVFrame *AvcodecAllocFrame(void);
- int AvcodecOpen(AVCodecContext *ctx, AVCodec *codec);
-@@ -117,15 +117,15 @@
- DynaLink m_libAvcodec;
- DynaLink m_libAvutil;
- 
--CodecID m_codec;
-+AVCodecID m_codec;
- char m_codecString[32];
- 
- void (*Favcodec_init)(void);
- void (*Fav_init_packet)(AVPacket *pkt);
- 
- void (*Favcodec_register_all)(void);
--AVCodec *(*Favcodec_find_encoder)(enum CodecID id);
--AVCodec *(*Favcodec_find_decoder)(enum CodecID id);
-+AVCodec *(*Favcodec_find_encoder)(enum AVCodecID id);
-+AVCodec *(*Favcodec_find_decoder)(enum AVCodecID id);
- AVCodecContext *(*Favcodec_alloc_context)(void);
- AVFrame *(*Favcodec_alloc_frame)(void);
- int (*Favcodec_open)(AVCodecContext *ctx, AVCodec *codec);
 plugins/video/H.263-1998/h263-1998.cxx
-+++ plugins/video/H.263-1998/h263-1998.cxx
-@@ -43,6 +43,12 @@
-  * $Date: 2014/04/29 09:02:06 $
-  */
- 
-+#define CODEC_FLAG_H263P_UMV  0x0200
-+#define CODEC_FLAG_H263P_SLICE_STRUCT 0x1000
-+#define CODEC_FLAG_H263P_AIV  0x0008
-+#define CODEC_FLAG_OBMC   0x0001
-+#define FF_I_TYPE  1
-+
- #ifndef PLUGIN_CODEC_DLL_EXPORTS
- #include "plugin-config.h"
- #endif
-@@ -94,7 +100,7 @@
-   { CIF16_WIDTH, CIF16_HEIGHT, PLUGINCODEC_CIF16_MPI },
- };
- 
--static FFMPEGLibrary FFMPEGLibraryInstance(CODEC_ID_H263P);
-+static FFMPEGLibrary FFMPEGLibraryInstance(AV_CODEC_ID_H263P);
- 
- 
- /
-@@ -203,7 +209,7 @@
-   PTRACE(4, m_prefix, "Encoder closed");
- }
- 
--bool H263_Base_EncoderContext::Init(CodecID codecId)
-+bool H263_Base_EncoderContext::Init(AVCodecID codecId)
- {
-   PTRACE(5, m_prefix, "Opening encoder");
- 
-@@ -616,7 +622,7 @@
- 
- bool H263_RFC2190_EncoderContext::Init()
- {
--  if (!H263_Base_EncoderContext::Init(CODEC_ID_H263))
-+  if (!H263_Base_EncoderContext::Init(AV_CODEC_ID_H263))
- return false;
- 
- #if LIBAVCODEC_RTP_MODE
-@@ -661,7 +667,7 @@
- 
- bool H263_RFC2429_EncoderContext::Init()
- {
--  return H263_Base_EncoderContext::Init(CODEC_ID_H263P);
-+  return 

[gentoo-commits] repo/gentoo:master commit in: net-libs/opal/, net-libs/opal/files/

[Pacho Ramos]

commit: eb032a7df8f22e980bab0cc686c0ccfb4ce231c0
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun May 28 11:51:50 2017 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun May 28 11:51:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb032a7d

net-libs/opal: Support ffmpeg-3 (#575230 by Oleg)

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-libs/opal/files/opal-3.10.10-ffmpeg2-1.patch | 396 +++
 net-libs/opal/opal-3.10.11-r1.ebuild | 253 +++
 2 files changed, 649 insertions(+)

diff --git a/net-libs/opal/files/opal-3.10.10-ffmpeg2-1.patch 
b/net-libs/opal/files/opal-3.10.10-ffmpeg2-1.patch
new file mode 100644
index 000..6b58ac28f3d
--- /dev/null
+++ b/net-libs/opal/files/opal-3.10.10-ffmpeg2-1.patch
@@ -0,0 +1,396 @@
+Submitted By:Igor Živković 
+Date:2013-10-08
+Initial Package Version: 3.10.10
+Upstream Status: Unknown
+Origin:  Gentoo
+Description: Fixes building against FFmpeg version >= 2.0.0
+
+diff -Naur opal-3.10.10.orig/plugins/video/common/dyna.cxx 
opal-3.10.10/plugins/video/common/dyna.cxx
+--- opal-3.10.10.orig/plugins/video/common/dyna.cxx2013-02-20 
03:18:05.0 +0100
 opal-3.10.10/plugins/video/common/dyna.cxx 2013-10-08 12:57:25.058873513 
+0200
+@@ -210,7 +210,7 @@
+ #endif
+ 
+ 
+-FFMPEGLibrary::FFMPEGLibrary(CodecID codec)
++FFMPEGLibrary::FFMPEGLibrary(AVCodecID codec)
+ {
+   m_codec = codec;
+   if (m_codec==CODEC_ID_H264)
+@@ -348,12 +348,12 @@
+   return true;
+ }
+ 
+-AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum CodecID id)
++AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum AVCodecID id)
+ {
+   return Favcodec_find_encoder(id);
+ }
+ 
+-AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum CodecID id)
++AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum AVCodecID id)
+ {
+   WaitAndSignal m(processLock);
+ 
+diff -Naur opal-3.10.10.orig/plugins/video/common/dyna.h 
opal-3.10.10/plugins/video/common/dyna.h
+--- opal-3.10.10.orig/plugins/video/common/dyna.h  2013-02-20 
03:18:05.0 +0100
 opal-3.10.10/plugins/video/common/dyna.h   2013-10-08 12:57:25.058873513 
+0200
+@@ -88,13 +88,13 @@
+ class FFMPEGLibrary 
+ {
+   public:
+-FFMPEGLibrary(CodecID codec);
++FFMPEGLibrary(AVCodecID codec);
+ ~FFMPEGLibrary();
+ 
+ bool Load();
+ 
+-AVCodec *AvcodecFindEncoder(enum CodecID id);
+-AVCodec *AvcodecFindDecoder(enum CodecID id);
++AVCodec *AvcodecFindEncoder(enum AVCodecID id);
++AVCodec *AvcodecFindDecoder(enum AVCodecID id);
+ AVCodecContext *AvcodecAllocContext(void);
+ AVFrame *AvcodecAllocFrame(void);
+ int AvcodecOpen(AVCodecContext *ctx, AVCodec *codec);
+@@ -117,15 +117,15 @@
+ DynaLink m_libAvcodec;
+ DynaLink m_libAvutil;
+ 
+-CodecID m_codec;
++AVCodecID m_codec;
+ char m_codecString[32];
+ 
+ void (*Favcodec_init)(void);
+ void (*Fav_init_packet)(AVPacket *pkt);
+ 
+ void (*Favcodec_register_all)(void);
+-AVCodec *(*Favcodec_find_encoder)(enum CodecID id);
+-AVCodec *(*Favcodec_find_decoder)(enum CodecID id);
++AVCodec *(*Favcodec_find_encoder)(enum AVCodecID id);
++AVCodec *(*Favcodec_find_decoder)(enum AVCodecID id);
+ AVCodecContext *(*Favcodec_alloc_context)(void);
+ AVFrame *(*Favcodec_alloc_frame)(void);
+ int (*Favcodec_open)(AVCodecContext *ctx, AVCodec *codec);
+diff -Naur opal-3.10.10.orig/plugins/video/common/ffmpeg/libavcodec/avcodec.h 
opal-3.10.10/plugins/video/common/ffmpeg/libavcodec/avcodec.h
+--- opal-3.10.10.orig/plugins/video/common/ffmpeg/libavcodec/avcodec.h 
2013-02-20 03:18:04.0 +0100
 opal-3.10.10/plugins/video/common/ffmpeg/libavcodec/avcodec.h  
2013-10-08 12:57:25.060873488 +0200
+@@ -101,7 +101,7 @@
+  * 1. no value of a existing codec ID changes (that would break ABI),
+  * 2. it is as close as possible to similar codecs.
+  */
+-enum CodecID {
++enum AVCodecID {
+ CODEC_ID_NONE,
+ 
+ /* video codecs */
+@@ -1390,7 +1390,7 @@
+ 
+ char codec_name[32];
+ enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */
+-enum CodecID codec_id; /* see CODEC_ID_xxx */
++enum AVCodecID codec_id; /* see CODEC_ID_xxx */
+ 
+ /**
+  * fourcc (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 
'A').
+@@ -2843,7 +2843,7 @@
+  */
+ const char *name;
+ enum AVMediaType type;
+-enum CodecID id;
++enum AVCodecID id;
+ int priv_data_size;
+ int (*init)(AVCodecContext *);
+ int (*encode)(AVCodecContext *, uint8_t *buf, int buf_size, void *data);
+@@ -2898,7 +2898,7 @@
+  *
+  * See CODEC_ID_xxx
+  */
+-enum CodecID id;
++enum AVCodecID id;
+ 
+ /**
+  * Supported pixel format.
+@@ -3402,10 +3402,10 @@
+ /**
+  * Find a registered encoder with a matching codec ID.
+  *
+- * @param id CodecID of the requested encoder
++ * @param id