[gentoo-commits] gentoo-x86 commit in media-plugins/vdr-image/files: vdr-image-0.3.1-ffmpeg-1.patch

[gentoo-commits] gentoo-x86 commit in media-plugins/vdr-image/files: vdr-image-0.3.1-ffmpeg-1.patch

[Alexis Ballier (aballier)]

aballier    13/01/17 22:32:32

  Added:                vdr-image-0.3.1-ffmpeg-1.patch
  Log:
  fix build with ffmpeg-1, part of bug #443428
  
  (Portage version: 2.2.0_alpha154/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

Revision  Changes    Path
1.1                  media-plugins/vdr-image/files/vdr-image-0.3.1-ffmpeg-1.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-image/files/vdr-image-0.3.1-ffmpeg-1.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-image/files/vdr-image-0.3.1-ffmpeg-1.patch?rev=1.1&content-type=text/plain

Index: vdr-image-0.3.1-ffmpeg-1.patch
===================================================================
https://bugs.gentoo.org/show_bug.cgi?id=443428

Index: image-0.3.1/liboutput/encode.c
===================================================================
--- image-0.3.1.orig/liboutput/encode.c
+++ image-0.3.1/liboutput/encode.c
@@ -49,7 +49,6 @@ cEncode::cEncode(unsigned int nNumberOfF
 
 bool cEncode::Register()
 {
-    avcodec_init();
 #if 0 
     // XXX to resolv: dosen't work with osdpip
     register_avcodec(&mpeg2video_encoder);

[gentoo-commits] gentoo-x86 commit in media-plugins/vdr-image/files: vdr-image-0.3.1-ffmpeg-1.patch

[Tomas Chvatal (scarabeus)]

scarabeus    13/06/17 19:29:23

  Modified:             vdr-image-0.3.1-ffmpeg-1.patch
  Log:
  Update ffmpeg patch to fix libav9 build too. Fixes bug#443428.
  
  (Portage version: 2.2.0_alpha180/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

Revision  Changes    Path
1.2                  media-plugins/vdr-image/files/vdr-image-0.3.1-ffmpeg-1.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-image/files/vdr-image-0.3.1-ffmpeg-1.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-image/files/vdr-image-0.3.1-ffmpeg-1.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-image/files/vdr-image-0.3.1-ffmpeg-1.patch?r1=1.1&r2=1.2

Index: vdr-image-0.3.1-ffmpeg-1.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/files/vdr-image-0.3.1-ffmpeg-1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vdr-image-0.3.1-ffmpeg-1.patch	17 Jan 2013 22:32:32 -0000	1.1
+++ vdr-image-0.3.1-ffmpeg-1.patch	17 Jun 2013 19:29:23 -0000	1.2
@@ -1,10 +1,7 @@
-https://bugs.gentoo.org/show_bug.cgi?id=443428
-
-Index: image-0.3.1/liboutput/encode.c
-===================================================================
---- image-0.3.1.orig/liboutput/encode.c
-+++ image-0.3.1/liboutput/encode.c
-@@ -49,7 +49,6 @@ cEncode::cEncode(unsigned int nNumberOfF
+diff -urN image-0.3.1.old/liboutput/encode.c image-0.3.1/liboutput/encode.c
+--- image-0.3.1.old/liboutput/encode.c	2013-06-17 21:23:23.308430203 +0200
++++ image-0.3.1/liboutput/encode.c	2013-06-17 21:27:37.126421173 +0200
+@@ -49,7 +49,6 @@
  
  bool cEncode::Register()
  {
@@ -12,3 +9,32 @@
  #if 0 
      // XXX to resolv: dosen't work with osdpip
      register_avcodec(&mpeg2video_encoder);
+@@ -100,7 +99,7 @@
+     AVCodecContext  *pAVCC = NULL;
+     AVFrame         *pAVF = NULL;
+ 
+-    pAVCC = avcodec_alloc_context();
++    pAVCC = avcodec_alloc_context3(NULL);
+     if (! pAVCC) 
+     {
+         esyslog("imageplugin: Failed to alloc memory for AVCodecContext.");
+@@ -116,7 +115,7 @@
+         {
+             SetupEncodingParameters(pAVCC);
+ 
+-            if (avcodec_open(pAVCC, m_pavCodec) < 0) 
++            if (avcodec_open2(pAVCC, m_pavCodec, NULL) < 0) 
+             {
+                 esyslog("imageplugin: Couldn't open Codec.");
+             }
+diff -urN image-0.3.1.old/liboutput/encode.h image-0.3.1/liboutput/encode.h
+--- image-0.3.1.old/liboutput/encode.h	2013-06-17 21:23:23.308430203 +0200
++++ image-0.3.1/liboutput/encode.h	2013-06-17 21:27:37.127421173 +0200
+@@ -14,6 +14,7 @@
+ 
+ extern "C" {
+ #include <libavcodec/avcodec.h>
++#include <libavutil/mem.h>
+ }
+ 
+ #include "../setup-image.h"