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/aasc.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/aasc.c')
| -rw-r--r-- | libavcodec/aasc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/aasc.c b/libavcodec/aasc.c index a91721e28d..6abf3b7acc 100644 --- a/libavcodec/aasc.c +++ b/libavcodec/aasc.c @@ -101,7 +101,7 @@ static int aasc_decode_frame(AVCodecContext *avctx, switch (avctx->codec_tag) { case MKTAG('A', 'A', 'S', '4'): bytestream2_init(&s->gb, buf - 4, buf_size + 4); - ff_msrle_decode(avctx, (AVPicture*)s->frame, 8, &s->gb); + ff_msrle_decode(avctx, s->frame, 8, &s->gb); break; case MKTAG('A', 'A', 'S', 'C'): switch (compr) { @@ -117,7 +117,7 @@ static int aasc_decode_frame(AVCodecContext *avctx, break; case 1: bytestream2_init(&s->gb, buf, buf_size); - ff_msrle_decode(avctx, (AVPicture*)s->frame, 8, &s->gb); + ff_msrle_decode(avctx, s->frame, 8, &s->gb); break; default: av_log(avctx, AV_LOG_ERROR, "Unknown compression type %d\n", compr); |