summaryrefslogtreecommitdiffstats
path: root/libavcodec/movtextdec.c
Commit message (Collapse)AuthorAgeFilesLines
* lavc/ccaption_dec: improve default styleClément Bœsch2016-01-101-1/+2
| | | | Use monospaced font, and a black box outline.
* avcodec/movtextdec: Free ftab_tempMichael Niedermayer2015-08-311-1/+5
| | | | | | | | Fixes memleak Fixes: efe937780e95574250dabe07151bdc23/unknown_unknown_351_849_cov_3187578556_shellymanne.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/movtextdec: Make tx3g_ptr unsignedMichael Niedermayer2015-08-311-1/+1
| | | | | | | | Fixes integer overflow Fixes: efe937780e95574250dabe07151bdc23/unknown_unknown_351_849_cov_3187578556_shellymanne.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* movtextdec: Add support for automatic text wrappingNiklesh2015-08-141-1/+24
| | | | | | | | | | | The value of wrap_flag in the Text Wrap Box specifies if the text is to be wrapped or not. Uses 'end of line wrap' amongst the wrap styles supported by ASS if the text is to be wrapped, i.e; fill as much text in a line as possible, then break to next line. The 3GPP spec has no provision for smart wrapping. Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
* movtextdec: Use default style information from movtext headerNiklesh2015-08-121-4/+78
| | | | | | | | As suggested, posting the combined patch with the fate changes. The patch sets the default style in ASS from the default style information present in the movtext header. Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
* Revert "movtextdec: Use default style information from movtext header"Michael Niedermayer2015-08-101-78/+4
| | | | | | | | The commit broke sub-movtext and sub-subripenc fate output differs between mips ad x86 so updating fate ref is not possible This reverts commit d670848d4c2757068ff43a68c05d01b28c809fb4.
* movtextdec: Use default style information from movtext headerNiklesh2015-08-091-4/+78
| | | | Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
* movtextdec: Fix memory leaks by freeing mem allocs correctlyNiklesh2015-08-071-1/+1
| | | | | | Initialize m->count_f to 0 at the correct place to free memory allocs properly. Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
* avcodec/movtextdec: check that ftab has been allocated before dereferencing itMichael Niedermayer2015-08-061-3/+5
| | | | | | Fixes potential null pointer dereference on deallocation Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* movtextdec.c: Add support for font namesNiklesh2015-08-061-3/+108
| | | | Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
* movtextdec.c: Add support for fontsizeNiklesh2015-07-261-8/+6
| | | | | | | | Add support for fontsize in style records. The patch uses reset to directly change back to default style instead of using closing tags, since we are not handling the default styles right now. Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
* movtextdec.c: Correct the highlight tagsNiklesh2015-07-201-3/+3
| | | | Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
* movtextdec.c: Add support for highlight and hilightcolor boxNiklesh2015-07-121-80/+172
| | | | Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
* movtextdec.c: Improve upon dynarrays and text_to_assNiklesh2015-06-221-45/+56
| | | | Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
* Improve upon dynamic arrays- movtext subtitlesNiklesh2015-05-251-16/+18
| | | | Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
* avcodec/movtextdec: Add support for large boxes(>32 bit)Niklesh2015-05-221-4/+15
| | | | Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
* Fix movtext crashes caused due to lack of proper bounds checkingNiklesh2015-05-191-3/+15
| | | | Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
* avcodec/movtextdec: Decoding of Bold-Italic_Underlined styles for 3gpp timed ↵Niklesh2015-04-251-6/+91
| | | | | | | | | text subtitles Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in> Previous version reviewed-by: Philip Langdale <philipl@overt.org> Previous version reviewed-by: Carl Eugen Hoyos <cehoyos@ag.or.at> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/ass: add ASS trailing \r\n in one single placeClément Bœsch2014-10-191-1/+0
|
* avcodec/ass: assume raw=0 in ff_ass_add_rect_bprintClément Bœsch2014-10-191-1/+1
|
* avcodec/movtextdec: add some memory checksClément Bœsch2014-09-211-7/+5
|
* lavc/movtextdec: keep the min size instead of max to fix overread.Clément Bœsch2013-01-011-1/+1
| | | | Fixes Ticket #2087.
* movtextdec: Don't emit errors for normal duration-end packets.Philip Langdale2012-08-151-2/+12
| | | | | | | | The logic here was off. If the packet size is exactly two, then it's a well-formed empty subtitle, used to mark the end of the duration of the previous subtitle. Signed-off-by: Philip Langdale <philipl@overt.org>
* Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer2012-08-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '36ef5369ee9b336febc2c270f8718cec4476cb85': Replace all CODEC_ID_* with AV_CODEC_ID_* lavc: add AV prefix to codec ids. Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/examples/muxing.c ffmpeg.c ffprobe.c ffserver.c libavcodec/8svx.c libavcodec/avcodec.h libavcodec/dnxhd_parser.c libavcodec/dvdsubdec.c libavcodec/error_resilience.c libavcodec/h263dec.c libavcodec/libvorbisenc.c libavcodec/mjpeg_parser.c libavcodec/mjpegenc.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pcm.c libavcodec/r210dec.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/version.h libavdevice/alsa-audio-dec.c libavdevice/bktr.c libavdevice/v4l2.c libavformat/asfdec.c libavformat/asfenc.c libavformat/avformat.h libavformat/avidec.c libavformat/caf.c libavformat/electronicarts.c libavformat/flacdec.c libavformat/flvdec.c libavformat/flvenc.c libavformat/framecrcenc.c libavformat/img2.c libavformat/img2dec.c libavformat/img2enc.c libavformat/ipmovie.c libavformat/isom.c libavformat/matroska.c libavformat/matroskadec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/movenc.c libavformat/mp3dec.c libavformat/mpeg.c libavformat/mpegts.c libavformat/mxf.c libavformat/mxfdec.c libavformat/mxfenc.c libavformat/nsvdec.c libavformat/nut.c libavformat/oggenc.c libavformat/pmpdec.c libavformat/rawdec.c libavformat/rawenc.c libavformat/riff.c libavformat/sdp.c libavformat/utils.c libavformat/vocenc.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* movtextdec: fix return value for too small packets.Nicolas George2012-07-311-1/+1
|
* movtextdec: 3GPP TS 26.245 Timed Text Decoder.Philip Langdale2012-07-141-0/+106
This change introduces a basic decoder for 3GPP Timed Text subtitles, also known as TX3G, Quicktime subtitles, or "movtext" in the existing code. This initial change doesn't attempt to parse styling information, and just reads the plain text of the subtitles. I intend to add support for styles eventually, but it's challenging due to a lack of existing players that support them. Signed-off-by: Philip Langdale <philipl@overt.org>
OpenPOWER on IntegriCloud