diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-11 22:29:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-11 22:29:48 +0100 |
| commit | 355cea8ddc9bcf9e485dd4fdc9ffe7a491450c97 (patch) | |
| tree | a56312a296dc5dde90af4c572e9aa60982fb3d97 /libavdevice/dshow.c | |
| parent | 43bf4297e4db95be5901c04ec8e89901c187b01d (diff) | |
| parent | c0479f0f062f61debadeefa17e4e9814901342a3 (diff) | |
| download | ffmpeg-355cea8ddc9bcf9e485dd4fdc9ffe7a491450c97.tar.gz | |
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>
Diffstat (limited to 'libavdevice/dshow.c')
0 files changed, 0 insertions, 0 deletions