Clément Bœsch
722fb81dc5
avformat/jacosubdec: make probing less tolerant.
...
Fixes a failure with probetest:
./tools/probetest 8192 500000
[...]
Failure of jacosub probing code with score=51 type=1 p=CAB size=16
Random data was:
00000000 40 37 40 30 93 01 48 e0 09 96 10 90 78 0f 0c 10 @7@0..H.....x...
2013-11-19 12:53:20 +01:00
Clément Bœsch
90fc00a623
avformat/subtitles: add a next line jumper and use it.
...
This fixes a bunch of possible overread in avformat with the idiom p +=
strcspn(p, "\n") + 1 (strcspn() can focus on the trailing '\0' if no
'\n' is found, so the +1 leads to an overread).
Note on lavf/matroskaenc: no extra subtitles.o Makefile dependency is
added because only the header is required for ff_subtitles_next_line().
Note on lavf/mpsubdec: code gets slightly complex to avoid an infinite
loop in the probing since there is no more forced increment.
2013-09-08 18:48:09 +02:00
Michael Niedermayer
097f668047
avformat: replace "AVPROBE_SCORE_MAX / X" by AVPROBE_SCORE_EXTENSION / Y
...
Demuxers where the changed code looked less readable where skiped
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-05 13:34:56 +02:00
Clément Bœsch
8bc74221f8
lavf: remove generic index flag from text subtitles.
...
This flag is not necessary.
2013-01-02 10:32:21 +01:00
Clément Bœsch
67286fa98b
10l: export ff_bprint_to_extradata between libs using avpriv_ prefix.
...
Both libavformat and libavcodec requires this function.
2012-12-30 22:54:56 +01:00
Clément Bœsch
36e61e24e7
lavc: add ff_bprint_to_extradata() helper and use it.
...
This commit also makes sure the extradata and subtitle_header are NUL
terminated, without taking into account the trailing '\0' in account in
the size.
At the same time, it should fix 'warning: dereferencing type-punned
pointer will break strict-aliasing rules' warning for compilers who
don't consider uint8_t** and char** compatibles.
2012-12-30 22:19:04 +01:00
Clément Bœsch
bad4e112a2
lavf: use ff_subtitles_queue_seek() for text subtitles demuxers.
2012-12-02 00:06:03 +01:00
Michael Niedermayer
7a72695c05
Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'
...
* 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-08-07 22:45:46 +02:00
Clément Bœsch
0ef28e119e
lavf/jacosubdec: fix FPE in case timeres is badly set.
2012-06-29 20:19:59 +02:00
Clément Bœsch
60715511db
lavf/jacosubdec: use subtitles queue API.
2012-06-29 19:13:25 +02:00
Clément Bœsch
303619d3ca
jacosub_probe: slightly increase the score to limit misdetection.
2012-05-31 22:12:46 +02:00
Clément Bœsch
908293d1bc
jacosub_probe: speedup by making only one call to sscanf
2012-05-31 21:55:35 +02:00
Clément Bœsch
9ae570fb5f
JACOsub demuxer, decoder and muxer.
2012-05-03 19:37:14 +02:00
