diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2013-06-17 19:29:23 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2013-06-17 19:29:23 +0000 |
| commit | 6408b11a3e0c847ac9c47ea0a26cf373c998ea60 (patch) | |
| tree | 19a7965f2ae3ebf538f9d9fab74fc4924ed44d0f /media-plugins/vdr-image/files | |
| parent | Stable for HPPA (bug #473558). (diff) | |
| download | gentoo-2-6408b11a3e0c847ac9c47ea0a26cf373c998ea60.tar.gz gentoo-2-6408b11a3e0c847ac9c47ea0a26cf373c998ea60.tar.bz2 gentoo-2-6408b11a3e0c847ac9c47ea0a26cf373c998ea60.zip | |
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)
Diffstat (limited to 'media-plugins/vdr-image/files')
| -rw-r--r-- | media-plugins/vdr-image/files/vdr-image-0.3.1-ffmpeg-1.patch | 40 |
1 files changed, 33 insertions, 7 deletions
diff --git a/media-plugins/vdr-image/files/vdr-image-0.3.1-ffmpeg-1.patch b/media-plugins/vdr-image/files/vdr-image-0.3.1-ffmpeg-1.patch index d4a193869b9f..78fd1d384435 100644 --- a/media-plugins/vdr-image/files/vdr-image-0.3.1-ffmpeg-1.patch +++ b/media-plugins/vdr-image/files/vdr-image-0.3.1-ffmpeg-1.patch @@ -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 @@ Index: image-0.3.1/liboutput/encode.c #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" |