[FFmpeg-cvslog] qsv_api: fix building with libmfx disabled

Anton Khirnov git at videolan.org
Thu Feb 19 21:27:41 CET 2015


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Thu Feb 19 17:35:34 2015 +0100| [0fbb271318899a0fb1fbcbb3db8292e909b91e23] | committer: Anton Khirnov

qsv_api: fix building with libmfx disabled

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0fbb271318899a0fb1fbcbb3db8292e909b91e23
---

 libavcodec/qsv_api.c |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/libavcodec/qsv_api.c b/libavcodec/qsv_api.c
index 8fde494..234b596 100644
--- a/libavcodec/qsv_api.c
+++ b/libavcodec/qsv_api.c
@@ -18,11 +18,25 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "config.h"
+
+#include <stddef.h>
+
 #include "libavutil/mem.h"
 
+#if CONFIG_QSV
 #include "qsv.h"
 
 AVQSVContext *av_qsv_alloc_context(void)
 {
     return av_mallocz(sizeof(AVQSVContext));
 }
+#else
+
+struct AVQSVContext *av_qsv_alloc_context(void);
+
+struct AVQSVContext *av_qsv_alloc_context(void)
+{
+    return NULL;
+}
+#endif



More information about the ffmpeg-cvslog mailing list