diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-29 14:10:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-29 14:10:11 +0100 |
| commit | 31d8d61f590ef6ebc22607d891158fc418c796a7 (patch) | |
| tree | 7734b1445a0a7ae6b0dc854a666a240c4d995125 /libavcodec/mimic.c | |
| parent | f02033b98b7545dad2e123a939ac7dceb1ce2f7a (diff) | |
| parent | aec50f79e7460340a148a3096fe212d67edc2c64 (diff) | |
| download | ffmpeg-31d8d61f590ef6ebc22607d891158fc418c796a7.tar.gz | |
Merge commit 'aec50f79e7460340a148a3096fe212d67edc2c64'
* commit 'aec50f79e7460340a148a3096fe212d67edc2c64':
rawdec: use AVPALETTE_SIZE instead of magic constants.
mimic: remove a pointless cast.
mdec: return meaningful error codes.
Conflicts:
libavcodec/rawdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mimic.c')
| -rw-r--r-- | libavcodec/mimic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mimic.c b/libavcodec/mimic.c index d30bac3d76..54d27e8af3 100644 --- a/libavcodec/mimic.c +++ b/libavcodec/mimic.c @@ -297,7 +297,7 @@ static int decode(MimicContext *ctx, int quality, int num_coeffs, * Flip the buffer upside-down and put it in the YVU order to match the * way Mimic encodes frames. */ -static void prepare_avpic(MimicContext *ctx, AVPicture *dst, AVPicture *src) +static void prepare_avpic(MimicContext *ctx, AVPicture *dst, AVFrame *src) { int i; dst->data[0] = src->data[0] + ( ctx->avctx->height - 1) * src->linesize[0]; @@ -374,7 +374,7 @@ static int mimic_decode_frame(AVCodecContext *avctx, void *data, ctx->next_cur_index = (ctx->cur_index - 1) & 15; prepare_avpic(ctx, &ctx->flipped_ptrs[ctx->cur_index], - (AVPicture*) &ctx->buf_ptrs[ctx->cur_index]); + &ctx->buf_ptrs[ctx->cur_index]); ff_thread_finish_setup(avctx); |