Date: Sat, 16 Nov 2013 11:50:05 +0000 (UTC) From: Juergen Lock <nox@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333986 - head/multimedia/vdr-plugin-markad/files Message-ID: <201311161150.rAGBo5Sn080451@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nox Date: Sat Nov 16 11:50:04 2013 New Revision: 333986 URL: http://svnweb.freebsd.org/changeset/ports/333986 Log: Chase ffmpeg update. Obtained from: funtoo (files/patch-vdr-markad-0.1.4-libav9) Added: head/multimedia/vdr-plugin-markad/files/patch-command-decoder.cpp-ffmpeg1 (contents, props changed) head/multimedia/vdr-plugin-markad/files/patch-vdr-markad-0.1.4-libav9 (contents, props changed) Added: head/multimedia/vdr-plugin-markad/files/patch-command-decoder.cpp-ffmpeg1 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/vdr-plugin-markad/files/patch-command-decoder.cpp-ffmpeg1 Sat Nov 16 11:50:04 2013 (r333986) @@ -0,0 +1,11 @@ +--- a/command/decoder.cpp ++++ b/command/decoder.cpp +@@ -164,7 +164,7 @@ cMarkAdDecoder::cMarkAdDecoder(bool useH + } + + video_codec=NULL; +- CodecID video_codecid; ++ AVCodecID video_codecid; + + if (useH264) + { Added: head/multimedia/vdr-plugin-markad/files/patch-vdr-markad-0.1.4-libav9 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/vdr-plugin-markad/files/patch-vdr-markad-0.1.4-libav9 Sat Nov 16 11:50:04 2013 (r333986) @@ -0,0 +1,40 @@ +diff -urN markad-0.1.4.old/command/decoder.cpp markad-0.1.4/command/decoder.cpp +--- markad-0.1.4.old/command/decoder.cpp 2013-06-17 21:52:44.333367552 +0200 ++++ markad-0.1.4/command/decoder.cpp 2013-06-17 21:53:03.708366863 +0200 +@@ -11,6 +11,7 @@ + #include <sys/types.h> + #include <string.h> + #include <cstdlib> ++#include <stdio.h> + + #include "decoder.h" + +@@ -172,7 +173,7 @@ + + if (video_codec) + { +- video_context = avcodec_alloc_context(); ++ video_context = avcodec_alloc_context3(NULL); + if (video_context) + { + if (video_codec->capabilities & CODEC_CAP_TRUNCATED) +@@ -321,7 +322,7 @@ + { + avcodec_flush_buffers(video_context); + AVCodecContext *dest; +- dest=avcodec_alloc_context(); ++ dest=avcodec_alloc_context3(NULL); + if (dest) + { + if (avcodec_copy_context(dest,video_context)!=0) ret=false; +diff -urN markad-0.1.4.old/command/decoder.h markad-0.1.4/command/decoder.h +--- markad-0.1.4.old/command/decoder.h 2013-06-17 21:52:44.333367552 +0200 ++++ markad-0.1.4/command/decoder.h 2013-06-17 21:53:03.708366863 +0200 +@@ -18,6 +18,7 @@ + #include <avcodec.h> + #else + #include <libavcodec/avcodec.h> ++#include <libavutil/mem.h> + #endif + + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311161150.rAGBo5Sn080451>