diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-22 20:42:29 +0300 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-22 20:43:44 +0300 |
| commit | d3cc258a6167bfb35d2add761d7d7912f1cd085f (patch) | |
| tree | 4ba47a6bb3d8da87ffad343bddb9ac1f42ea2860 /libavcodec/msrledec.c | |
| parent | e9a2ab3ac7830c1f65371a71e651004a9e41ecd8 (diff) | |
| parent | 3496cec43304ac040d6d05f9d500a6f93cc049e7 (diff) | |
Merge commit '3496cec43304ac040d6d05f9d500a6f93cc049e7'
* commit '3496cec43304ac040d6d05f9d500a6f93cc049e7':
msrle: Use AVFrame instead of AVPicture
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/msrledec.c')
| -rw-r--r-- | libavcodec/msrledec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/msrledec.c b/libavcodec/msrledec.c index 3aa5e3ceb9..805802ae18 100644 --- a/libavcodec/msrledec.c +++ b/libavcodec/msrledec.c @@ -30,7 +30,7 @@ #include "avcodec.h" #include "msrledec.h" -static int msrle_decode_pal4(AVCodecContext *avctx, AVPicture *pic, +static int msrle_decode_pal4(AVCodecContext *avctx, AVFrame *pic, GetByteContext *gb) { unsigned char rle_code; @@ -126,7 +126,7 @@ static int msrle_decode_pal4(AVCodecContext *avctx, AVPicture *pic, } -static int msrle_decode_8_16_24_32(AVCodecContext *avctx, AVPicture *pic, +static int msrle_decode_8_16_24_32(AVCodecContext *avctx, AVFrame *pic, int depth, GetByteContext *gb) { uint8_t *output, *output_end; @@ -246,7 +246,7 @@ static int msrle_decode_8_16_24_32(AVCodecContext *avctx, AVPicture *pic, } -int ff_msrle_decode(AVCodecContext *avctx, AVPicture *pic, +int ff_msrle_decode(AVCodecContext *avctx, AVFrame *pic, int depth, GetByteContext *gb) { switch(depth){ |