Changeset ec13849 in ffmpeg

Timestamp:

Dec 15, 2013, 2:27:11 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

f6cd447

Parents:

6f9be910 (diff), 97f880e7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (12/15/13 02:27:06)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (12/15/13 02:27:11)

Message:

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>

(No files)