diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-22 19:42:29 +0200 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-22 19:43:44 +0200 |
commit | d3cc258a6167bfb35d2add761d7d7912f1cd085f (patch) | |
tree | 4ba47a6bb3d8da87ffad343bddb9ac1f42ea2860 /libavcodec/msrledec.h | |
parent | e9a2ab3ac7830c1f65371a71e651004a9e41ecd8 (diff) | |
parent | 3496cec43304ac040d6d05f9d500a6f93cc049e7 (diff) | |
download | ffmpeg-d3cc258a6167bfb35d2add761d7d7912f1cd085f.tar.gz |
Merge commit '3496cec43304ac040d6d05f9d500a6f93cc049e7'
* commit '3496cec43304ac040d6d05f9d500a6f93cc049e7':
msrle: Use AVFrame instead of AVPicture
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/msrledec.h')
-rw-r--r-- | libavcodec/msrledec.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/msrledec.h b/libavcodec/msrledec.h index 3f666360c5..7f7bbcf947 100644 --- a/libavcodec/msrledec.h +++ b/libavcodec/msrledec.h @@ -33,7 +33,7 @@ * @param depth bit depth * @param gb input bytestream context */ -int ff_msrle_decode(AVCodecContext *avctx, AVPicture *pic, +int ff_msrle_decode(AVCodecContext *avctx, AVFrame *pic, int depth, GetByteContext *gb); #endif /* AVCODEC_MSRLEDEC_H */ |