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/qsvdec.h | |
| parent | 151ae8ea5b54e12da6d53fa96d67026371e760ea (diff) | |
| parent | d0a63d8b989647ffdb5f40da8e1feaffe1a8e791 (diff) | |
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/qsvdec.h')
| -rw-r--r-- | libavcodec/qsvdec.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/libavcodec/qsvdec.h b/libavcodec/qsvdec.h index b57bcbfd74..a529003397 100644 --- a/libavcodec/qsvdec.h +++ b/libavcodec/qsvdec.h @@ -33,11 +33,6 @@ #include "avcodec.h" -#define QSV_VERSION_MAJOR 1 -#define QSV_VERSION_MINOR 1 - -#define ASYNC_DEPTH_DEFAULT 4 // internal parallelism - typedef struct QSVFrame { AVFrame *frame; mfxFrameSurface1 *surface; @@ -68,11 +63,6 @@ typedef struct QSVContext { int nb_ext_buffers; } QSVContext; -/** - * Convert a libmfx error code into a ffmpeg error code. - */ -int ff_qsv_error(int mfx_err); - int ff_qsv_map_pixfmt(enum AVPixelFormat format); int ff_qsv_init(AVCodecContext *s, QSVContext *q, mfxSession session); |