OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
669043d
)
avcodec/msvideo1: Fix palette in case of seek before decode
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 28 Feb 2014 12:20:22 +0000
(13:20 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 28 Feb 2014 12:20:22 +0000
(13:20 +0100)
Fixes Ticket3212
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/msvideo1.c
patch
|
blob
|
history
diff --git
a/libavcodec/msvideo1.c
b/libavcodec/msvideo1.c
index
970c67c
..
e60abee
100644
(file)
--- a/
libavcodec/msvideo1.c
+++ b/
libavcodec/msvideo1.c
@@
-67,6
+67,8
@@
static av_cold int msvideo1_decode_init(AVCodecContext *avctx)
if (s->avctx->bits_per_coded_sample == 8) {
s->mode_8bit = 1;
avctx->pix_fmt = AV_PIX_FMT_PAL8;
+ if (avctx->extradata_size >= AVPALETTE_SIZE)
+ memcpy(s->pal, avctx->extradata, AVPALETTE_SIZE);
} else {
s->mode_8bit = 0;
avctx->pix_fmt = AV_PIX_FMT_RGB555;