generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '0fbb271318899a0fb1fbcbb3db8292e909b91e23'

Browse Source 
* commit '0fbb271318899a0fb1fbcbb3db8292e909b91e23':
  qsv_api: fix building with libmfx disabled

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-02-19 21:12:29 +01:00
commit 99bcfe6227
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/qsv_api.c
View File

@ -18,11 +18,25 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "config.h"
#include <stddef.h>
#include "libavutil/mem.h" #include "libavutil/mem.h"
#if CONFIG_QSV
#include "qsv.h" #include "qsv.h"
AVQSVContext *av_qsv_alloc_context(void) AVQSVContext *av_qsv_alloc_context(void)
{ {
return av_mallocz(sizeof(AVQSVContext)); return av_mallocz(sizeof(AVQSVContext));
} }
#else
struct AVQSVContext *av_qsv_alloc_context(void);
struct AVQSVContext *av_qsv_alloc_context(void)
{
return NULL;
}
#endif