| @@ -68,7 +68,7 @@ static int qsv_init_session(AVCodecContext *avctx, QSVContext *q, mfxSession ses | |||||
| return 0; | return 0; | ||||
| } | } | ||||
| int ff_qsv_init(AVCodecContext *avctx, QSVContext *q, mfxSession session) | |||||
| int ff_qsv_decode_init(AVCodecContext *avctx, QSVContext *q, mfxSession session) | |||||
| { | { | ||||
| mfxVideoParam param = { { 0 } }; | mfxVideoParam param = { { 0 } }; | ||||
| int ret; | int ret; | ||||
| @@ -272,7 +272,7 @@ int ff_qsv_decode(AVCodecContext *avctx, QSVContext *q, | |||||
| return bs.DataOffset; | return bs.DataOffset; | ||||
| } | } | ||||
| int ff_qsv_close(QSVContext *q) | |||||
| int ff_qsv_decode_close(QSVContext *q) | |||||
| { | { | ||||
| QSVFrame *cur = q->work_frames; | QSVFrame *cur = q->work_frames; | ||||
| @@ -65,12 +65,12 @@ typedef struct QSVContext { | |||||
| int ff_qsv_map_pixfmt(enum AVPixelFormat format); | int ff_qsv_map_pixfmt(enum AVPixelFormat format); | ||||
| int ff_qsv_init(AVCodecContext *s, QSVContext *q, mfxSession session); | |||||
| int ff_qsv_decode_init(AVCodecContext *s, QSVContext *q, mfxSession session); | |||||
| int ff_qsv_decode(AVCodecContext *s, QSVContext *q, | int ff_qsv_decode(AVCodecContext *s, QSVContext *q, | ||||
| AVFrame *frame, int *got_frame, | AVFrame *frame, int *got_frame, | ||||
| AVPacket *avpkt); | AVPacket *avpkt); | ||||
| int ff_qsv_close(QSVContext *q); | |||||
| int ff_qsv_decode_close(QSVContext *q); | |||||
| #endif /* AVCODEC_QSVDEC_H */ | #endif /* AVCODEC_QSVDEC_H */ | ||||
| @@ -74,7 +74,7 @@ static av_cold int qsv_decode_close(AVCodecContext *avctx) | |||||
| { | { | ||||
| QSVH264Context *s = avctx->priv_data; | QSVH264Context *s = avctx->priv_data; | ||||
| ff_qsv_close(&s->qsv); | |||||
| ff_qsv_decode_close(&s->qsv); | |||||
| qsv_clear_buffers(s); | qsv_clear_buffers(s); | ||||
| @@ -195,7 +195,7 @@ static int qsv_process_data(AVCodecContext *avctx, AVFrame *frame, | |||||
| s->qsv.nb_ext_buffers = user_ctx->nb_ext_buffers; | s->qsv.nb_ext_buffers = user_ctx->nb_ext_buffers; | ||||
| } | } | ||||
| ret = ff_qsv_init(avctx, &s->qsv, session); | |||||
| ret = ff_qsv_decode_init(avctx, &s->qsv, session); | |||||
| if (ret < 0) | if (ret < 0) | ||||
| goto reinit_fail; | goto reinit_fail; | ||||
| } | } | ||||