Merge commit '9ba27c23'

* commit '9ba27c23':
  qsvdec: add 'decode' to the non-static function names
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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;
 

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 */

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;
     }