mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
Merge pull request #663 from stefansaraev/xbmc
xbmc-*: avfilter depends on avformat
This commit is contained in:
commit
cdc50c8ae1
@ -0,0 +1,41 @@
|
|||||||
|
From d1e06c28d3eb6cd689b8cbc5b96babe81707baa7 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Rainer Hochecker <fernetmenta@online.de>
|
||||||
|
Date: Sun, 15 Apr 2012 14:00:22 +0200
|
||||||
|
Subject: [PATCH] ffmpeg: avfilter depends on avformat
|
||||||
|
|
||||||
|
---
|
||||||
|
lib/DllAvFilter.h | 4 ++++
|
||||||
|
1 file changed, 4 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/lib/DllAvFilter.h b/lib/DllAvFilter.h
|
||||||
|
index 5c83654..6ae5d15 100644
|
||||||
|
--- a/lib/DllAvFilter.h
|
||||||
|
+++ b/lib/DllAvFilter.h
|
||||||
|
@@ -25,6 +25,7 @@
|
||||||
|
#endif
|
||||||
|
#include "DynamicDll.h"
|
||||||
|
#include "DllAvCodec.h"
|
||||||
|
+#include "DllAvFormat.h"
|
||||||
|
#include "DllSwResample.h"
|
||||||
|
#include "utils/log.h"
|
||||||
|
|
||||||
|
@@ -203,6 +204,7 @@ class DllAvFilter : public DllDynamic, DllAvFilterInterface
|
||||||
|
/* dependencies of libavfilter */
|
||||||
|
DllAvUtil m_dllAvUtil;
|
||||||
|
DllSwResample m_dllSwResample;
|
||||||
|
+ DllAvFormat m_dllAvFormat;
|
||||||
|
|
||||||
|
public:
|
||||||
|
int avfilter_open(AVFilterContext **filter_ctx, AVFilter *filter, const char *inst_name)
|
||||||
|
@@ -251,6 +253,8 @@ class DllAvFilter : public DllDynamic, DllAvFilterInterface
|
||||||
|
return false;
|
||||||
|
if (!m_dllSwResample.Load())
|
||||||
|
return false;
|
||||||
|
+ if (!m_dllAvFormat.Load())
|
||||||
|
+ return false;
|
||||||
|
return DllDynamic::Load();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
--
|
||||||
|
1.7.10
|
||||||
|
|
@ -0,0 +1,41 @@
|
|||||||
|
From d1e06c28d3eb6cd689b8cbc5b96babe81707baa7 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Rainer Hochecker <fernetmenta@online.de>
|
||||||
|
Date: Sun, 15 Apr 2012 14:00:22 +0200
|
||||||
|
Subject: [PATCH] ffmpeg: avfilter depends on avformat
|
||||||
|
|
||||||
|
---
|
||||||
|
lib/DllAvFilter.h | 4 ++++
|
||||||
|
1 file changed, 4 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/lib/DllAvFilter.h b/lib/DllAvFilter.h
|
||||||
|
index 5c83654..6ae5d15 100644
|
||||||
|
--- a/lib/DllAvFilter.h
|
||||||
|
+++ b/lib/DllAvFilter.h
|
||||||
|
@@ -25,6 +25,7 @@
|
||||||
|
#endif
|
||||||
|
#include "DynamicDll.h"
|
||||||
|
#include "DllAvCodec.h"
|
||||||
|
+#include "DllAvFormat.h"
|
||||||
|
#include "DllSwResample.h"
|
||||||
|
#include "utils/log.h"
|
||||||
|
|
||||||
|
@@ -203,6 +204,7 @@ class DllAvFilter : public DllDynamic, DllAvFilterInterface
|
||||||
|
/* dependencies of libavfilter */
|
||||||
|
DllAvUtil m_dllAvUtil;
|
||||||
|
DllSwResample m_dllSwResample;
|
||||||
|
+ DllAvFormat m_dllAvFormat;
|
||||||
|
|
||||||
|
public:
|
||||||
|
int avfilter_open(AVFilterContext **filter_ctx, AVFilter *filter, const char *inst_name)
|
||||||
|
@@ -251,6 +253,8 @@ class DllAvFilter : public DllDynamic, DllAvFilterInterface
|
||||||
|
return false;
|
||||||
|
if (!m_dllSwResample.Load())
|
||||||
|
return false;
|
||||||
|
+ if (!m_dllAvFormat.Load())
|
||||||
|
+ return false;
|
||||||
|
return DllDynamic::Load();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
--
|
||||||
|
1.7.10
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user