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:
a48440d
)
avcodec/msvideo1enc: fix SKIPS_MAX
author
Michael Niedermayer
<michaelni@gmx.at>
Thu, 9 Jan 2014 03:02:58 +0000
(
04:02
+0100)
committer
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Thu, 9 Jan 2014 10:43:21 +0000
(11:43 +0100)
Fixes Ticket3270
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
fb8f5d0510619cea2204246631f1c0dcd994ee25
)
libavcodec/msvideo1enc.c
patch
|
blob
|
history
diff --git
a/libavcodec/msvideo1enc.c
b/libavcodec/msvideo1enc.c
index
dd4b72f
..
896e1e1
100644
(file)
--- a/
libavcodec/msvideo1enc.c
+++ b/
libavcodec/msvideo1enc.c
@@
-57,7
+57,7
@@
enum MSV1Mode{
};
#define SKIP_PREFIX 0x8400
-#define SKIPS_MAX 0x0
F
FF
+#define SKIPS_MAX 0x0
3
FF
#define MKRGB555(in, off) ((in[off] << 10) | (in[off + 1] << 5) | (in[off + 2]))
static const int remap[16] = { 0, 1, 4, 5, 2, 3, 6, 7, 8, 9, 12, 13, 10, 11, 14, 15 };