1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

Merge commit '0fbb271318899a0fb1fbcbb3db8292e909b91e23'

* 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

View File

@ -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