summaryrefslogtreecommitdiff
path: root/libavformat/subtitles.c
Commit message (Collapse)AuthorAge
* Merge commit '1afddbe59e96af75f1c07605afc95615569f388f'Michael Niedermayer2013-03-08
| | | | | | | | | | | | | | | | | | * 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>
* Remove incorrect use of ctype.h functions.Reimar Döffinger2013-03-03
| | | | | | | 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>
* lavf: move stream==-1 handling from ff_subtitles_queue_seek() to ↵Michael Niedermayer2013-01-02
| | | | | | avformat_seek_file() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf: move srtdec:read_chunk() to subtitles utils.Clément Bœsch2012-12-30
| | | | This function can be useful for various other subtitles formats.
* lavf/subtitles: seek a little more backward when necessary.Clément Bœsch2012-12-02
| | | | | If some previous subtitles are overlapping with the current time we make sure they are raised so the renderer can display them too.
* lavf/subtitles: add ff_subtitles_queue_seek().Clément Bœsch2012-12-02
| | | | | | | | | | | | 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.
* lavf/subtitles: add some SMIL helpers.Clément Bœsch2012-06-29
| | | | This is needed for SAMI and RealText demuxers.
* lavf: add internal demuxer helpers for subtitles.Clément Bœsch2012-06-29