diff options
author | 2015-08-08 13:49:04 -0700 | |
---|---|---|
committer | 2015-08-08 17:38:18 -0700 | |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-plugins/vdr-osdpip/files/vdr-osdpip-libav-9.patch | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-plugins/vdr-osdpip/files/vdr-osdpip-libav-9.patch')
-rw-r--r-- | media-plugins/vdr-osdpip/files/vdr-osdpip-libav-9.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/media-plugins/vdr-osdpip/files/vdr-osdpip-libav-9.patch b/media-plugins/vdr-osdpip/files/vdr-osdpip-libav-9.patch new file mode 100644 index 000000000000..d1f531b325ce --- /dev/null +++ b/media-plugins/vdr-osdpip/files/vdr-osdpip-libav-9.patch @@ -0,0 +1,40 @@ +diff -urN osdpip-0.1.2.old/decoder.c osdpip-0.1.2/decoder.c +--- osdpip-0.1.2.old/decoder.c 2013-06-17 21:01:31.795476861 +0200 ++++ osdpip-0.1.2/decoder.c 2013-06-17 21:01:57.153475959 +0200 +@@ -34,8 +34,8 @@ + printf("codec not found\n"); + return -1; + } +- m_Context = avcodec_alloc_context(); +- if (avcodec_open(m_Context, m_Codec) < 0) ++ m_Context = avcodec_alloc_context3(m_Codec); ++ if (avcodec_open2(m_Context, m_Codec, NULL) < 0) + { + printf("could not open codec\n"); + return -1; +@@ -106,17 +106,17 @@ + return -1; + } + +- av_set_int(context, "srcw", m_Context->width - (OsdPipSetup.CropLeft + OsdPipSetup.CropRight)); +- av_set_int(context, "srch", m_Context->height - (OsdPipSetup.CropTop + OsdPipSetup.CropBottom)); +- av_set_int(context, "src_format", PIX_FMT_YUV420P); +- av_set_int(context, "dstw", m_Width); +- av_set_int(context, "dsth", m_Height); ++ av_opt_set_int(context, "srcw", m_Context->width - (OsdPipSetup.CropLeft + OsdPipSetup.CropRight), 0); ++ av_opt_set_int(context, "srch", m_Context->height - (OsdPipSetup.CropTop + OsdPipSetup.CropBottom), 0); ++ av_opt_set_int(context, "src_format", PIX_FMT_YUV420P, 0); ++ av_opt_set_int(context, "dstw", m_Width, 0); ++ av_opt_set_int(context, "dsth", m_Height, 0); + #ifdef USE_NEW_FFMPEG_HEADERS +- av_set_int(context, "dst_format", ConvertToRGB ? PIX_FMT_RGB32 : PIX_FMT_YUV420P); ++ av_opt_set_int(context, "dst_format", ConvertToRGB ? PIX_FMT_RGB32 : PIX_FMT_YUV420P, 0); + #else +- av_set_int(context, "dst_format", ConvertToRGB ? PIX_FMT_RGBA32 : PIX_FMT_YUV420P); ++ av_opt_set_int(context, "dst_format", ConvertToRGB ? PIX_FMT_RGBA32 : PIX_FMT_YUV420P, 0); + #endif +- av_set_int(context, "sws_flags", SWS_LANCZOS); ++ av_opt_set_int(context, "sws_flags", SWS_LANCZOS, 0); + + if (sws_init_context(context, NULL, NULL) < 0) { + printf("Error initializing conversion context.\n"); |