Merge commit '0fbb271318899a0fb1fbcbb3db8292e909b91e23'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Feb 2015 20:12:29 +0000 (21:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Feb 2015 20:12:33 +0000 (21:12 +0100)
* commit '0fbb271318899a0fb1fbcbb3db8292e909b91e23':
  qsv_api: fix building with libmfx disabled

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/qsv_api.c

index 8ae3d5b..327ff7d 100644 (file)
  * 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