12345678910111213141516171819202122232425262728293031323334353637383940414243444546 |
- --- xbmc-12.2.orig/lib/DllAvFilter.h 2013-05-03 07:57:40.000000000 +0200
- +++ xbmc-12.2/lib/DllAvFilter.h 2013-08-01 10:49:46.000000000 +0200
- @@ -45,6 +45,7 @@ extern "C" {
- #if (defined HAVE_LIBAVFILTER_AVFILTER_H)
- #include <libavfilter/avfiltergraph.h>
- #include <libavfilter/buffersink.h>
- + #include <libavfilter/buffersrc.h>
- #include <libavfilter/avcodec.h>
- #elif (defined HAVE_FFMPEG_AVFILTER_H)
- #include <ffmpeg/avfiltergraph.h>
- @@ -77,7 +78,7 @@ public:
- #if LIBAVFILTER_VERSION_INT < AV_VERSION_INT(3,0,0)
- virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, int flags)=0;
- #else
- - virtual int av_buffersrc_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, int flags)=0;
- + virtual int av_buffersrc_add_frame_flags(AVFilterContext *buffer_filter, AVFrame *frame, int flags)=0;
- #endif
- virtual void avfilter_unref_buffer(AVFilterBufferRef *ref)=0;
- virtual int avfilter_link(AVFilterContext *src, unsigned srcpad, AVFilterContext *dst, unsigned dstpad)=0;
- @@ -137,7 +138,7 @@ public:
- #if LIBAVFILTER_VERSION_INT < AV_VERSION_INT(3,0,0)
- virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, int flags) { return ::av_vsrc_buffer_add_frame(buffer_filter, frame, flags); }
- #else
- - virtual int av_buffersrc_add_frame(AVFilterContext *buffer_filter, AVFrame* frame, int flags) { return ::av_buffersrc_add_frame(buffer_filter, frame, flags); }
- + virtual int av_buffersrc_add_frame_flags(AVFilterContext *buffer_filter, AVFrame* frame, int flags) { return ::av_buffersrc_add_frame_flags(buffer_filter, frame, flags); }
- #endif
- virtual void avfilter_unref_buffer(AVFilterBufferRef *ref) { ::avfilter_unref_buffer(ref); }
- virtual int avfilter_link(AVFilterContext *src, unsigned srcpad, AVFilterContext *dst, unsigned dstpad) { return ::avfilter_link(src, srcpad, dst, dstpad); }
- @@ -175,7 +176,7 @@ class DllAvFilter : public DllDynamic, D
- #if LIBAVFILTER_VERSION_INT < AV_VERSION_INT(3,0,0)
- DEFINE_METHOD3(int, av_vsrc_buffer_add_frame, (AVFilterContext *p1, AVFrame *p2, int p3))
- #else
- - DEFINE_METHOD3(int, av_buffersrc_add_frame, (AVFilterContext *p1, AVFrame *p2, int p3))
- + DEFINE_METHOD3(int, av_buffersrc_add_frame_flag, (AVFilterContext *p1, AVFrame *p2, int p3))
- #endif
- DEFINE_METHOD1(void, avfilter_unref_buffer, (AVFilterBufferRef *p1))
- DEFINE_METHOD4(int, avfilter_link, (AVFilterContext *p1, unsigned p2, AVFilterContext *p3, unsigned p4))
- @@ -198,7 +199,7 @@ class DllAvFilter : public DllDynamic, D
- #if LIBAVFILTER_VERSION_INT < AV_VERSION_INT(3,0,0)
- RESOLVE_METHOD(av_vsrc_buffer_add_frame)
- #else
- - RESOLVE_METHOD(av_buffersrc_add_frame)
- + RESOLVE_METHOD(av_buffersrc_add_frame_flag)
- #endif
- RESOLVE_METHOD(avfilter_unref_buffer)
- RESOLVE_METHOD(avfilter_link)
|