OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6f9be91
97f880e
)
Merge remote-tracking branch 'cus/stable'
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 15 Dec 2013 02:27:06 +0000
(
03:27
+0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 15 Dec 2013 02:27:11 +0000
(
03:27
+0100)
* cus/stable:
libzvbi-teletextdec: set bitmap teletext canvas dimensions
libzvbi-teletextdec: add chopped top row size to y offset
libzvbi-teletextdec: use defined constants for bitmap char width and height
libzvbi-teletextdec: cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge