[FFmpeg-cvslog] Merge remote-tracking branch 'cus/stable'

Michael Niedermayer git at videolan.org
Mon Nov 11 22:35:30 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov 11 22:29:45 2013 +0100| [355cea8ddc9bcf9e485dd4fdc9ffe7a491450c97] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=355cea8ddc9bcf9e485dd4fdc9ffe7a491450c97
---





More information about the ffmpeg-cvslog mailing list