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:
4c2ce59
)
dvbsubenc: Fix placement of the object version
author
Ronen Mizrahi
<ronen@tversity.com>
Thu, 10 Feb 2011 16:50:00 +0000
(11:50 -0500)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 11 Feb 2011 01:54:10 +0000
(
02:54
+0100)
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
df211c3ab73b36208ac4511a9cd7feb817f551fa
)
libavcodec/dvbsub.c
patch
|
blob
|
history
diff --git
a/libavcodec/dvbsub.c
b/libavcodec/dvbsub.c
index
c2a1298
..
ed12823
100644
(file)
--- a/
libavcodec/dvbsub.c
+++ b/
libavcodec/dvbsub.c
@@
-223,7
+223,7
@@
static int encode_dvb_subtitles(DVBSubtitleContext *s,
else
page_state = 2; /* mode change */
/* page_version = 0 + page_state */
- *q++ =
s->object_version
| (page_state << 2) | 3;
+ *q++ =
(s->object_version << 4)
| (page_state << 2) | 3;
for (region_id = 0; region_id < h->num_rects; region_id++) {
*q++ = region_id;