diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-19 21:12:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-19 21:12:33 +0100 |
| commit | 99bcfe62278ffc11e2665e653dcb90336ec8d7ff (patch) | |
| tree | 27d489d4da8c96afd240c337159ad46b10336b7c /libavcodec/qsv_api.c | |
| parent | ac649bb775b9635db6810cb200ef81a777368e4a (diff) | |
| parent | 0fbb271318899a0fb1fbcbb3db8292e909b91e23 (diff) | |
| download | ffmpeg-99bcfe62278ffc11e2665e653dcb90336ec8d7ff.tar.gz | |
Merge commit '0fbb271318899a0fb1fbcbb3db8292e909b91e23'
* commit '0fbb271318899a0fb1fbcbb3db8292e909b91e23':
qsv_api: fix building with libmfx disabled
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/qsv_api.c')
| -rw-r--r-- | libavcodec/qsv_api.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/libavcodec/qsv_api.c b/libavcodec/qsv_api.c index 8ae3d5b9b6..327ff7d813 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 |