generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
56,269 Commits 24 Branches 241 Tags 173 MiB
108b91c3fe
Commit Graph

13 Commits

Author SHA1 Message Date
Clément Bœsch
378a830e7b avformat/subtitles: support standalone CR (MacOS). 
Recent .srt files with CR only were found in the wild.
 2013-09-08 18:48:35 +02:00
Clément Bœsch
b1319e14e3 avformat/subtitles: binary search seeking. 2013-09-08 12:54:49 +02:00
Clément Bœsch
1ca4bf930b avformat/subtitles: check lower bound for duration overlap seeking. 2013-09-08 12:54:49 +02:00
Clément Bœsch
f8678dcef3 avformat/vobsub: fix seeking. 2013-09-08 12:54:49 +02:00
Michael Niedermayer
5c504e4df7 vformat/subtitles: check av_copy_packets return code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-30 21:36:58 +02:00
Michael Niedermayer
2653e12520 Merge commit '1afddbe59e96af75f1c07605afc95615569f388f' 
* commit '1afddbe59e96af75f1c07605afc95615569f388f':
  avpacket: use AVBuffer to allow refcounting the packets.

Conflicts:
	libavcodec/avpacket.c
	libavcodec/utils.c
	libavdevice/v4l2.c
	libavformat/avidec.c
	libavformat/flacdec.c
	libavformat/id3v2.c
	libavformat/matroskaenc.c
	libavformat/mux.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-08 19:12:03 +01:00
Reimar Döffinger
88d55b827d Remove incorrect use of ctype.h functions. 
As far as I can tell the code should not change behaviour
depending on locale in any of these places.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2013-03-03 21:44:10 +01:00
Michael Niedermayer
aa86d2d884 lavf: move stream==-1 handling from ff_subtitles_queue_seek() to avformat_seek_file() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-02 23:02:33 +01:00
Clément Bœsch
d9ac8d2967 lavf: move srtdec:read_chunk() to subtitles utils. 
This function can be useful for various other subtitles formats.
 2012-12-30 22:58:58 +01:00
Clément Bœsch
ad5d72b123 lavf/subtitles: seek a little more backward when necessary. 
If some previous subtitles are overlapping with the current time
we make sure they are raised so the renderer can display them too.
 2012-12-02 00:06:03 +01:00
Clément Bœsch
ff3624b1ad lavf/subtitles: add ff_subtitles_queue_seek(). 
This function is almost identical to lavf/assdec:read_seek2(). It
performs a generic seek for text subtitles demuxers for the new seeking
API.

The only difference with assdec:read_seek2 is the ts_diff being
unsigned to avoid overflows.

The seek callback in the ASS demuxer will be removed when it is
redesigned to use FFDemuxSubtitlesQueue.
 2012-12-02 00:06:03 +01:00
Clément Bœsch
d948893dbd lavf/subtitles: add some SMIL helpers. 
This is needed for SAMI and RealText demuxers.
 2012-06-29 20:20:02 +02:00
Clément Bœsch
7c9f9685ae lavf: add internal demuxer helpers for subtitles. 2012-06-29 19:13:24 +02:00