diff options
author | Juergen Lock <nox@FreeBSD.org> | 2013-11-16 11:50:04 +0000 |
---|---|---|
committer | Juergen Lock <nox@FreeBSD.org> | 2013-11-16 11:50:04 +0000 |
commit | 5a943a50615ff9ed9ce365f162e129b49ab20f62 (patch) | |
tree | 3e9ce0d99dd4fb320d0feccceac07fc523f3312c /multimedia/vdr-plugin-markad/files | |
parent | aceb0084431df46108bbe8928b259eadf1b4cccc (diff) | |
download | ports-5a943a50615ff9ed9ce365f162e129b49ab20f62.tar.gz ports-5a943a50615ff9ed9ce365f162e129b49ab20f62.zip |
Chase ffmpeg update.
Obtained from: funtoo (files/patch-vdr-markad-0.1.4-libav9)
Notes
Notes:
svn path=/head/; revision=333986
Diffstat (limited to 'multimedia/vdr-plugin-markad/files')
-rw-r--r-- | multimedia/vdr-plugin-markad/files/patch-command-decoder.cpp-ffmpeg1 | 11 | ||||
-rw-r--r-- | multimedia/vdr-plugin-markad/files/patch-vdr-markad-0.1.4-libav9 | 40 |
2 files changed, 51 insertions, 0 deletions
diff --git a/multimedia/vdr-plugin-markad/files/patch-command-decoder.cpp-ffmpeg1 b/multimedia/vdr-plugin-markad/files/patch-command-decoder.cpp-ffmpeg1 new file mode 100644 index 000000000000..22203237a4cd --- /dev/null +++ b/multimedia/vdr-plugin-markad/files/patch-command-decoder.cpp-ffmpeg1 @@ -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) + { 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 new file mode 100644 index 000000000000..fca9cbb49e35 --- /dev/null +++ b/multimedia/vdr-plugin-markad/files/patch-vdr-markad-0.1.4-libav9 @@ -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) |