diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-15 03:27:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-15 03:27:11 +0100 |
| commit | ec13849ce2dc24d0c951acc01cb247df526c2eed (patch) | |
| tree | 208229defce2fbf555cd78c745de97e55c93dd48 /libavformat/afc.c | |
| parent | 6f9be9106382083b2268ddb3599fbf49abb36f6b (diff) | |
| parent | 97f880e7a9526465a966565598741f4cc25ecc47 (diff) | |
| download | ffmpeg-ec13849ce2dc24d0c951acc01cb247df526c2eed.tar.gz | |
Merge remote-tracking branch 'cus/stable'
* 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>
Diffstat (limited to 'libavformat/afc.c')
0 files changed, 0 insertions, 0 deletions