diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-29 14:20:05 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-29 14:20:05 +0200 |
| commit | 27673f1bea1a390785b8c421213bcc53aca969e4 (patch) | |
| tree | 7ecd03b74ba2558a5f21e8e367a96f60222b2dec /libavcodec | |
| parent | b1284a4b4a6c7f80fa27ef3909929a4a7a950713 (diff) | |
| parent | 8aecec84021a61b943718ff3d7c2c57fcd4af199 (diff) | |
| download | ffmpeg-27673f1bea1a390785b8c421213bcc53aca969e4.tar.gz | |
Merge commit '8aecec84021a61b943718ff3d7c2c57fcd4af199'
* commit '8aecec84021a61b943718ff3d7c2c57fcd4af199':
qsvdec: make ff_qsv_decode_init() static
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/qsvdec.c | 4 | ||||
| -rw-r--r-- | libavcodec/qsvdec.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c index 84caec290e..9fefc41020 100644 --- a/libavcodec/qsvdec.c +++ b/libavcodec/qsvdec.c @@ -49,7 +49,7 @@ int ff_qsv_map_pixfmt(enum AVPixelFormat format) } } -int ff_qsv_decode_init(AVCodecContext *avctx, QSVContext *q, AVPacket *avpkt) +static int qsv_decode_init(AVCodecContext *avctx, QSVContext *q, AVPacket *avpkt) { mfxVideoParam param = { { 0 } }; mfxBitstream bs = { { { 0 } } }; @@ -323,7 +323,7 @@ static int do_qsv_decode(AVCodecContext *avctx, QSVContext *q, int flush = !avpkt->size || q->reinit_pending; if (!q->engine_ready) { - ret = ff_qsv_decode_init(avctx, q, avpkt); + ret = qsv_decode_init(avctx, q, avpkt); if (ret) return ret; } diff --git a/libavcodec/qsvdec.h b/libavcodec/qsvdec.h index 2b989c259a..97a3315b75 100644 --- a/libavcodec/qsvdec.h +++ b/libavcodec/qsvdec.h @@ -78,8 +78,6 @@ typedef struct QSVContext { int ff_qsv_map_pixfmt(enum AVPixelFormat format); -int ff_qsv_decode_init(AVCodecContext *s, QSVContext *q, AVPacket *avpkt); - int ff_qsv_decode(AVCodecContext *s, QSVContext *q, AVFrame *frame, int *got_frame, AVPacket *avpkt); |