diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-28 01:25:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-28 01:25:20 +0100 |
| commit | d985976e54aec274d0c261091f77559d1a1bef84 (patch) | |
| tree | 34fd29f7395ef7708db802955a4c5433b523b6c1 /libavcodec/qsvdec.h | |
| parent | b12eacb3837cad2daaeda1f77ceb1045bca68789 (diff) | |
| parent | 9ba27c2348d26000257e891e40a72facb0d916be (diff) | |
| download | ffmpeg-d985976e54aec274d0c261091f77559d1a1bef84.tar.gz | |
Merge commit '9ba27c2348d26000257e891e40a72facb0d916be'
* commit '9ba27c2348d26000257e891e40a72facb0d916be':
qsvdec: add 'decode' to the non-static function names
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/qsvdec.h')
| -rw-r--r-- | libavcodec/qsvdec.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/qsvdec.h b/libavcodec/qsvdec.h index a529003397..2221e4cdf2 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 */ |