diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 19:36:08 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 19:40:59 +0400 |
| commit | 0b74fd11341230721ef188d520e166b105fb111c (patch) | |
| tree | 1a58104d6a3ed555757493112b677def569badc2 /libavcodec/yop.c | |
| parent | 73562f1f834ef0ec8f5f881be73a135b9348c112 (diff) | |
| parent | dff6197dfb9b2d145729885c63f865c5fdd184aa (diff) | |
Merge commit 'dff6197dfb9b2d145729885c63f865c5fdd184aa'
* commit 'dff6197dfb9b2d145729885c63f865c5fdd184aa':
nuv: do not rely on get_buffer() initializing the frame.
yop: initialize palette to 0
Conflicts:
libavcodec/nuv.c
tests/ref/fate/nuv-rtjpeg-fh
tests/ref/fate/yop
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/yop.c')
| -rw-r--r-- | libavcodec/yop.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/yop.c b/libavcodec/yop.c index be30fa4064..234868abbf 100644 --- a/libavcodec/yop.c +++ b/libavcodec/yop.c @@ -206,6 +206,9 @@ static int yop_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, return ret; } + if (!avctx->frame_number) + memset(s->frame.data[1], 0, AVPALETTE_SIZE); + s->dstbuf = s->frame.data[0]; s->dstptr = s->frame.data[0]; s->srcptr = avpkt->data + 4; |