diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-14 15:19:43 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-14 15:19:43 +0100 |
| commit | 1bc6cdf2fcbd3caea7b78d0a617c6e338606d756 (patch) | |
| tree | 9b0050a5d72d12d67b1fb82ffcc1a2a2effea7e9 /libavcodec/qsv_internal.h | |
| parent | e122a725fbe9bc5c1bb6047d6be8e0f504d660b9 (diff) | |
| parent | 536bb17e9659c5ed7576a218d4085cdd6d5742fa (diff) | |
Merge commit '536bb17e9659c5ed7576a218d4085cdd6d5742fa'
* commit '536bb17e9659c5ed7576a218d4085cdd6d5742fa':
qsvdec: make ff_qsv_map_pixfmt() return a MFX fourcc as well
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/qsv_internal.h')
| -rw-r--r-- | libavcodec/qsv_internal.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/qsv_internal.h b/libavcodec/qsv_internal.h index 82e1029a8b..5d2a216ce6 100644 --- a/libavcodec/qsv_internal.h +++ b/libavcodec/qsv_internal.h @@ -65,6 +65,8 @@ int ff_qsv_error(int mfx_err); int ff_qsv_codec_id_to_mfx(enum AVCodecID codec_id); int ff_qsv_profile_to_mfx(enum AVCodecID codec_id, int profile); +int ff_qsv_map_pixfmt(enum AVPixelFormat format, uint32_t *fourcc); + int ff_qsv_init_internal_session(AVCodecContext *avctx, mfxSession *session, const char *load_plugins); |