Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-09-01avcodec/movtextdec: Free ftab_tempMichael Niedermayer
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>
2015-09-01avcodec/movtextdec: Make tx3g_ptr unsignedMichael Niedermayer
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>
2015-08-15movtextdec: Add support for automatic text wrappingNiklesh
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>
2015-08-13movtextdec: Use default style information from movtext headerNiklesh
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>
2015-08-10Revert "movtextdec: Use default style information from movtext header"Michael Niedermayer
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.
2015-08-10movtextdec: Use default style information from movtext headerNiklesh
Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
2015-08-08movtextdec: Fix memory leaks by freeing mem allocs correctlyNiklesh
Initialize m->count_f to 0 at the correct place to free memory allocs properly. Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
2015-08-07avcodec/movtextdec: check that ftab has been allocated before dereferencing itMichael Niedermayer
Fixes potential null pointer dereference on deallocation Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-06movtextdec.c: Add support for font namesNiklesh
Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
2015-07-26movtextdec.c: Add support for fontsizeNiklesh
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>
2015-07-20movtextdec.c: Correct the highlight tagsNiklesh
Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
2015-07-12movtextdec.c: Add support for highlight and hilightcolor boxNiklesh
Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
2015-06-23movtextdec.c: Improve upon dynarrays and text_to_assNiklesh
Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
2015-05-25Improve upon dynamic arrays- movtext subtitlesNiklesh
Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
2015-05-22avcodec/movtextdec: Add support for large boxes(>32 bit)Niklesh
Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
2015-05-20Fix movtext crashes caused due to lack of proper bounds checkingNiklesh
Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
2015-04-25avcodec/movtextdec: Decoding of Bold-Italic_Underlined styles for 3gpp timed ↵Niklesh
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>
2014-10-20avcodec/ass: add ASS trailing \r\n in one single placeClément Bœsch
2014-10-20avcodec/ass: assume raw=0 in ff_ass_add_rect_bprintClément Bœsch
2014-09-21avcodec/movtextdec: add some memory checksClément Bœsch
2013-01-01lavc/movtextdec: keep the min size instead of max to fix overread.Clément Bœsch
Fixes Ticket #2087.
2012-08-16movtextdec: Don't emit errors for normal duration-end packets.Philip Langdale
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>
2012-08-08Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer
* 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>
2012-07-31movtextdec: fix return value for too small packets.Nicolas George
2012-07-15movtextdec: 3GPP TS 26.245 Timed Text Decoder.Philip Langdale
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>