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/tscc.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/tscc.c')
| -rw-r--r-- | libavcodec/tscc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/tscc.c b/libavcodec/tscc.c index 6b5e275ace..8c5ec68cf4 100644 --- a/libavcodec/tscc.c +++ b/libavcodec/tscc.c @@ -94,7 +94,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, if (ret != Z_DATA_ERROR) { bytestream2_init(&c->gb, c->decomp_buf, c->decomp_size - c->zstream.avail_out); - ff_msrle_decode(avctx, (AVPicture*)frame, c->bpp, &c->gb); + ff_msrle_decode(avctx, frame, c->bpp, &c->gb); } /* make the palette available on the way out */ |