summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2015-03-13 08:21:38 +0100
committerAnton Khirnov <anton@khirnov.net>2015-03-27 21:57:47 +0100
commit9ba27c2348d26000257e891e40a72facb0d916be (patch)
treec65c5bb02d606d6a3c22f987c66b0e922c949a54
parentd0a63d8b989647ffdb5f40da8e1feaffe1a8e791 (diff)
qsvdec: add 'decode' to the non-static function names
-rw-r--r--libavcodec/qsvdec.c4
-rw-r--r--libavcodec/qsvdec.h4
-rw-r--r--libavcodec/qsvdec_h264.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c
index 039a0fe925..c077b110db 100644
--- a/libavcodec/qsvdec.c
+++ b/libavcodec/qsvdec.c
@@ -68,7 +68,7 @@ static int qsv_init_session(AVCodecContext *avctx, QSVContext *q, mfxSession ses
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 } };
int ret;
@@ -272,7 +272,7 @@ int ff_qsv_decode(AVCodecContext *avctx, QSVContext *q,
return bs.DataOffset;
}
-int ff_qsv_close(QSVContext *q)
+int ff_qsv_decode_close(QSVContext *q)
{
QSVFrame *cur = q->work_frames;
diff --git a/libavcodec/qsvdec.h b/libavcodec/qsvdec.h
index 79ecaed068..11d19fea17 100644
--- a/libavcodec/qsvdec.h
+++ b/libavcodec/qsvdec.h
@@ -65,12 +65,12 @@ typedef struct QSVContext {
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,
AVFrame *frame, int *got_frame,
AVPacket *avpkt);
-int ff_qsv_close(QSVContext *q);
+int ff_qsv_decode_close(QSVContext *q);
#endif /* AVCODEC_QSVDEC_H */
diff --git a/libavcodec/qsvdec_h264.c b/libavcodec/qsvdec_h264.c
index ab60a1f867..b6527f0cc0 100644
--- a/libavcodec/qsvdec_h264.c
+++ b/libavcodec/qsvdec_h264.c
@@ -74,7 +74,7 @@ static av_cold int qsv_decode_close(AVCodecContext *avctx)
{
QSVH264Context *s = avctx->priv_data;
- ff_qsv_close(&s->qsv);
+ ff_qsv_decode_close(&s->qsv);
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;
}
- ret = ff_qsv_init(avctx, &s->qsv, session);
+ ret = ff_qsv_decode_init(avctx, &s->qsv, session);
if (ret < 0)
goto reinit_fail;
}