diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-19 22:52:29 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-19 23:12:04 +0300 |
commit | 841e9f431cf4b1be0b5c3932c289d405f34dfcc2 (patch) | |
tree | 6f7c1159a0ceff4a7287b6f9725dd0fbd4fafc96 /libavcodec/qsv_api.c | |
parent | 560eb7179a7c46ba277c9c120840816869a47a70 (diff) | |
parent | 4e08c821106fc1d6d358864abf0d8488b12f38c6 (diff) |
Merge commit '4e08c821106fc1d6d358864abf0d8488b12f38c6'
* commit '4e08c821106fc1d6d358864abf0d8488b12f38c6':
lavc: add an Intel libmfx-based H.264 decoder
Conflicts:
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/qsv_api.c')
-rw-r--r-- | libavcodec/qsv_api.c | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/libavcodec/qsv_api.c b/libavcodec/qsv_api.c new file mode 100644 index 0000000000..8ae3d5b9b6 --- /dev/null +++ b/libavcodec/qsv_api.c @@ -0,0 +1,28 @@ +/* + * Intel MediaSDK QSV public API functions + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "libavutil/mem.h" + +#include "qsv.h" + +AVQSVContext *av_qsv_alloc_context(void) +{ + return av_mallocz(sizeof(AVQSVContext)); +} |