1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-03 05:10:03 +02:00
Go to file
Philip Langdale 6af680fa07 srtdec: Add timing-less "subrip" decoder.
After various discussions, we concluded that, amongst other things,
it made sense to have a separate subrip decoder that did not use
in-band timing information, and rather relied on the ffmpeg level
timing.

As this is 90% the same as the existing srt decoder, it's implemented
in the same file.

Signed-off-by: Philip Langdale <philipl@overt.org>
2012-08-15 20:44:23 -07:00
compat Merge remote-tracking branch 'qatar/master' 2012-07-12 23:57:00 +02:00
doc Merge remote-tracking branch 'qatar/master' 2012-08-15 15:55:24 +02:00
libavcodec srtdec: Add timing-less "subrip" decoder. 2012-08-15 20:44:23 -07:00
libavdevice lavd/x11grab: deprecate "nomouse" specification in filename 2012-08-08 23:43:37 +02:00
libavfilter Merge remote-tracking branch 'qatar/master' 2012-08-14 15:34:39 +02:00
libavformat lavf: minor bump for avformat_queue_attached_pictures() 2012-08-16 04:57:08 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-08-15 15:55:24 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-08-14 15:34:39 +02:00
libpostproc Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
libswresample Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-08-14 15:34:39 +02:00
mt-work Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
presets
tests prores_kostya: fix incorrect picture_size field. 2012-08-14 16:57:39 +02:00
tools tools: add a script to find missing codec descriptors. 2012-08-13 10:44:59 +02:00
.gitignore Merge remote-tracking branch 'qatar/master' 2012-08-09 00:51:02 +02:00
arch.mak
Changelog Add ICO muxer 2012-08-14 16:54:25 +02:00
cmdutils_common_opts.h
cmdutils.c cmdutils: show options in show_help_children only if the context has options 2012-08-10 23:14:44 +02:00
cmdutils.h Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
common.mak checkheaders: Rename HEADEROBJS to HOBJS 2012-08-09 05:02:45 +02:00
configure Merge remote-tracking branch 'qatar/master' 2012-08-14 15:34:39 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
ffmpeg_filter.c Merge remote-tracking branch 'qatar/master' 2012-08-09 00:51:02 +02:00
ffmpeg_opt.c ffmpeg: make -s work for subtitles too. 2012-08-14 11:17:45 +02:00
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2012-08-14 15:34:39 +02:00
ffmpeg.h ffmpeg: add an option to fix subtitles durations. 2012-08-14 11:17:45 +02:00
ffplay.c ffplay: reque attached pictures on channel changes. 2012-08-16 04:38:54 +02:00
ffprobe.c Merge remote-tracking branch 'qatar/master' 2012-08-14 15:34:39 +02:00
ffserver.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
INSTALL
library.mak Merge remote-tracking branch 'qatar/master' 2012-08-09 00:51:02 +02:00
LICENSE LICENSE: correct incorrect claims on *GPL incompatibility 2012-08-16 04:47:18 +02:00
MAINTAINERS Canopus Lossless decoder 2012-08-01 22:02:19 -04:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-08-10 04:46:13 +02:00
README
RELEASE RELEASE: update, seem this has been forgotten 2012-07-01 21:21:07 +02:00
version.sh

FFmpeg README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory in git.
  You can also view it online at http://ffmpeg.org/documentation.html

2) Licensing
------------

* See the LICENSE file.

3) Build and Install
--------------------

* See the INSTALL file.