diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-28 01:16:21 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-28 01:16:21 +0100 |
commit | b12eacb3837cad2daaeda1f77ceb1045bca68789 (patch) | |
tree | 10428214a95fd2fce6c115ebf0dac9c709d35b4f /libavcodec/qsv_internal.h | |
parent | 151ae8ea5b54e12da6d53fa96d67026371e760ea (diff) | |
parent | d0a63d8b989647ffdb5f40da8e1feaffe1a8e791 (diff) | |
download | ffmpeg-streaming-b12eacb3837cad2daaeda1f77ceb1045bca68789.zip ffmpeg-streaming-b12eacb3837cad2daaeda1f77ceb1045bca68789.tar.gz |
Merge commit 'd0a63d8b989647ffdb5f40da8e1feaffe1a8e791'
* commit 'd0a63d8b989647ffdb5f40da8e1feaffe1a8e791':
qsvdec: split off some code that will be shared with the encoder
Conflicts:
libavcodec/Makefile
libavcodec/qsvdec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/qsv_internal.h')
-rw-r--r-- | libavcodec/qsv_internal.h | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/libavcodec/qsv_internal.h b/libavcodec/qsv_internal.h new file mode 100644 index 0000000..b107913 --- /dev/null +++ b/libavcodec/qsv_internal.h @@ -0,0 +1,38 @@ +/* + * Intel MediaSDK QSV encoder/decoder shared code + * + * 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 + */ + +#ifndef AVCODEC_QSV_INTERNAL_H +#define AVCODEC_QSV_INTERNAL_H + +#define QSV_VERSION_MAJOR 1 +#define QSV_VERSION_MINOR 1 + +#define ASYNC_DEPTH_DEFAULT 4 // internal parallelism + +/** + * Convert a libmfx error code into a libav error code. + */ +int ff_qsv_error(int mfx_err); + +int ff_qsv_codec_id_to_mfx(enum AVCodecID codec_id); + +int ff_qsv_init_internal_session(AVCodecContext *avctx, mfxSession *session); + +#endif /* AVCODEC_QSV_INTERNAL_H */ |