virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge commit '8aecec84021a61b943718ff3d7c2c57fcd4af199'

Browse Source 
* commit '8aecec84021a61b943718ff3d7c2c57fcd4af199':
  qsvdec: make ff_qsv_decode_init() static

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes
2015-09-29 14:20:05 +02:00
parent b1284a4b4a 8aecec8402
commit 27673f1bea
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/qsvdec.c
View File

@@ -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 } }; mfxVideoParam param = { { 0 } };
mfxBitstream bs = { { { 0 } } }; mfxBitstream bs = { { { 0 } } };
@@ -323,7 +323,7 @@ static int do_qsv_decode(AVCodecContext *avctx, QSVContext *q,
int flush = !avpkt->size || q->reinit_pending; int flush = !avpkt->size || q->reinit_pending;
if (!q->engine_ready) { if (!q->engine_ready) {
ret = ff_qsv_decode_init(avctx, q, avpkt); ret = qsv_decode_init(avctx, q, avpkt);
if (ret) if (ret)
return ret; return ret;
} }

2
libavcodec/qsvdec.h
View File

@@ -78,8 +78,6 @@ typedef struct QSVContext {
int ff_qsv_map_pixfmt(enum AVPixelFormat format); 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, int ff_qsv_decode(AVCodecContext *s, QSVContext *q,
AVFrame *frame, int *got_frame, AVFrame *frame, int *got_frame,
AVPacket *avpkt); AVPacket *avpkt);