virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit '9ba27c2348d26000257e891e40a72facb0d916be'

Browse Source 
* commit '9ba27c2348d26000257e891e40a72facb0d916be':
  qsvdec: add 'decode' to the non-static function names

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-03-28 01:25:16 +01:00
commit d985976e54
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/qsvdec.c
View File

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

4
libavcodec/qsvdec.h
View File

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

4
libavcodec/qsvdec_h264.c
View File

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