diff options
author | Ben Woods <woodsb02@FreeBSD.org> | 2016-05-10 15:35:19 +0000 |
---|---|---|
committer | Ben Woods <woodsb02@FreeBSD.org> | 2016-05-10 15:35:19 +0000 |
commit | f44f67e9b8093b1620f3abcf1a0cf62844232930 (patch) | |
tree | 01273598056c1692ec32443b05a21fc2388f4b57 /multimedia/vdr-plugin-markad/files/patch-vdr-markad-0.1.4-libav9 | |
parent | 5fb19cc017161787e7dd5ca5f9c30910f6e9ea03 (diff) | |
download | ports-f44f67e9b8093b1620f3abcf1a0cf62844232930.tar.gz ports-f44f67e9b8093b1620f3abcf1a0cf62844232930.zip |
multimedia/vdr-plugin-markad: Fix build with ffmpeg 3.0.x
- Update patch of command/decoder.cpp to allow vdr-plugin-markad to
build successfully once multimedia/ffmpeg is updated to 3.0.x.
Note that multimedia/ffmpeg is currently still on the 2.8.x branch,
however this patch is backwards compatible with ffmpeg 2.8.x.
The additional changes to this file were based on upstream bug
report #1898 [1], and also the requirement to replace
s/avcodec_alloc_frame/av_frame_alloc/g.
- Regenerate patches with makepatch (pet portlint), and remove
PATCH_STRIP=-p1 from Makefile.
[1] https://projects.vdr-developer.org/issues/1898
PR: 209386
Reported by: antoine (PR207547)
Reviewed by: mat (mentor)
Approved by: adamw (mentor)
Differential Revision: https://reviews.freebsd.org/D6283
Notes
Notes:
svn path=/head/; revision=414944
Diffstat (limited to 'multimedia/vdr-plugin-markad/files/patch-vdr-markad-0.1.4-libav9')
-rw-r--r-- | multimedia/vdr-plugin-markad/files/patch-vdr-markad-0.1.4-libav9 | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/multimedia/vdr-plugin-markad/files/patch-vdr-markad-0.1.4-libav9 b/multimedia/vdr-plugin-markad/files/patch-vdr-markad-0.1.4-libav9 deleted file mode 100644 index fca9cbb49e35..000000000000 --- a/multimedia/vdr-plugin-markad/files/patch-vdr-markad-0.1.4-libav9 +++ /dev/null @@ -1,40 +0,0 @@ -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) |