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/bmp.c | |
| 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/bmp.c')
| -rw-r--r-- | libavcodec/bmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/bmp.c b/libavcodec/bmp.c index 3019d01016..fa1d6a53f2 100644 --- a/libavcodec/bmp.c +++ b/libavcodec/bmp.c @@ -276,7 +276,7 @@ static int bmp_decode_frame(AVCodecContext *avctx, p->linesize[0] = -p->linesize[0]; } bytestream2_init(&gb, buf, dsize); - ff_msrle_decode(avctx, (AVPicture*)p, depth, &gb); + ff_msrle_decode(avctx, p, depth, &gb); if (height < 0) { p->data[0] += p->linesize[0] * (avctx->height - 1); p->linesize[0] = -p->linesize[0]; |