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:
70749c4
)
sunrast: Add a sample request for RMP_RAW colormap.
author
Aneesh Dogra
<lionaneesh@gmail.com>
Sun, 19 Feb 2012 18:27:21 +0000
(23:57 +0530)
committer
Justin Ruggles
<justin.ruggles@gmail.com>
Tue, 21 Feb 2012 21:00:06 +0000
(16:00 -0500)
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
libavcodec/sunrast.c
patch
|
blob
|
history
diff --git
a/libavcodec/sunrast.c
b/libavcodec/sunrast.c
index
fef17b4
..
b41bb2e
100644
(file)
--- a/
libavcodec/sunrast.c
+++ b/
libavcodec/sunrast.c
@@
-77,7
+77,11
@@
static int sunrast_decode_frame(AVCodecContext *avctx, void *data,
av_log(avctx, AV_LOG_ERROR, "invalid image size\n");
return AVERROR_INVALIDDATA;
}
- if (maptype & ~1) {
+ if (maptype == RMT_RAW) {
+ av_log_ask_for_sample(avctx, "unsupported colormap type\n");
+ return AVERROR_PATCHWELCOME;
+ }
+ if (maptype > RMT_RAW) {
av_log(avctx, AV_LOG_ERROR, "invalid colormap type\n");
return AVERROR_INVALIDDATA;
}