Changeset 355cea8d in ffmpeg

Timestamp:

Nov 11, 2013, 9:29:48 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

3b1dcdec

Parents:

43bf4297 (diff), c0479f0f (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> (11/11/13 21:29:45)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/11/13 21:29:48)

Message:

Merge remote-tracking branch 'cus/stable'

• cus/stable: libzvbi-teletextdec: propagate errors generated in page handler libzvbi-teletextdec: dont ignore memory allocation error silently libzvbi-teletextdec: output ass subtitles instead of plain text ass: move text_event_to_ass from textdec.c to ass.c and export it ass: fix error handling in ff_ass_add_subrect ass: factor out ff_ass_bprint_dialog libzvbi-teletextdec: use AVBPrint for whitespace cleanup libzvbi-teletextdec: use option constants instead of strings libzvbi-teletextdec: fix indentation after last commit libzvbi-teletextdec: support multiple teletext pages in a single packet

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)