diff options
author | wg <wg@FreeBSD.org> | 2013-10-20 00:43:32 +0800 |
---|---|---|
committer | wg <wg@FreeBSD.org> | 2013-10-20 00:43:32 +0800 |
commit | 7bd53d2a9f339dc47381e00f07db80cc4b59237c (patch) | |
tree | 69155a2473ecd42904d8ae76e85c62fefb67950b /multimedia/vdr-plugin-osdpip | |
parent | 51b8eaeb1ac21f9fe97de34ffac01229f11188ac (diff) | |
download | freebsd-ports-gnome-7bd53d2a9f339dc47381e00f07db80cc4b59237c.tar.gz freebsd-ports-gnome-7bd53d2a9f339dc47381e00f07db80cc4b59237c.tar.zst freebsd-ports-gnome-7bd53d2a9f339dc47381e00f07db80cc4b59237c.zip |
multimedia/ffmpeg: update to 2.0.1
- Update main ffmpeg port to 2.0.1
- Bump and update dependent ports when necessary (API change)
Approved by: portmgr (bapt)
Diffstat (limited to 'multimedia/vdr-plugin-osdpip')
-rw-r--r-- | multimedia/vdr-plugin-osdpip/files/patch-ffmpeg1 | 26 | ||||
-rw-r--r-- | multimedia/vdr-plugin-osdpip/files/patch-libav9 | 40 |
2 files changed, 66 insertions, 0 deletions
diff --git a/multimedia/vdr-plugin-osdpip/files/patch-ffmpeg1 b/multimedia/vdr-plugin-osdpip/files/patch-ffmpeg1 new file mode 100644 index 000000000000..b0304ad5adc0 --- /dev/null +++ b/multimedia/vdr-plugin-osdpip/files/patch-ffmpeg1 @@ -0,0 +1,26 @@ +Index: osdpip-0.1.1/decoder.h +=================================================================== +--- osdpip-0.1.1.orig/decoder.h ++++ osdpip-0.1.1/decoder.h +@@ -34,7 +34,7 @@ extern "C" + #include <libavcodec/avcodec.h> + #ifdef USE_SWSCALE + #include <libswscale/swscale.h> +- #include <libavcodec/opt.h> ++ #include <libavutil/opt.h> + #endif + #else + #include <ffmpeg/avcodec.h> +Index: osdpip-0.1.1/osdpip.c +=================================================================== +--- osdpip-0.1.1.orig/osdpip.c ++++ osdpip-0.1.1/osdpip.c +@@ -73,8 +73,6 @@ bool cPluginOsdpip::ProcessArgs(int argc + + bool cPluginOsdpip::Initialize(void) + { +- // must be called before using avcodec lib +- avcodec_init(); + // register all the codecs (you can also register only the codec + // you wish to have smaller code) + avcodec_register_all(); diff --git a/multimedia/vdr-plugin-osdpip/files/patch-libav9 b/multimedia/vdr-plugin-osdpip/files/patch-libav9 new file mode 100644 index 000000000000..d1f531b325ce --- /dev/null +++ b/multimedia/vdr-plugin-osdpip/files/patch-libav9 @@ -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"); |