1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Go to file
Matthew Heaney 1029822a91 lavf/webvttdec: use private option to specify WebVTT kind
WebVTT subtitle tracks have four kinds. Certain downstream muxers
(such as for WebM) need to know which WebVTT kind this is, in order to
specify the codec id of the output track.

A new private input option, "-kind", has been added to the WebVTT
demuxer.  It accepts as a value any of "subtitles" (the default),
"captions", "descriptions", and "metadata".  The kind option value is
used to assign a value to the stream disposition flag, to which four
new values have been added, corresponding the four WebVTT kinds.

Signed-off-by: Matthew Heaney <matthewjheaney@google.com>
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
2013-06-25 00:13:47 +02:00
compat os2threads: move from lavc to compat/ 2013-05-28 12:49:20 +02:00
doc lavf: add AV_DISPOSITION flags for WebVTT text track kinds 2013-06-25 00:13:47 +02:00
libavcodec cllc: Use outbuf in RGB and ARGB functions 2013-06-24 17:59:58 -04:00
libavdevice avdevice/x11grab: allocate just one Cursor 2013-06-21 12:00:11 +02:00
libavfilter avfilter/vsrc_testsrc: fix artifacts with odd height 2013-06-24 23:21:17 +02:00
libavformat lavf/webvttdec: use private option to specify WebVTT kind 2013-06-25 00:13:47 +02:00
libavresample Merge commit '006ec64877fb638de4b15ae5fd969e22bd0f60ca' 2013-05-18 11:25:58 +02:00
libavutil avutil/ripemd: adjust loop condition to silence CID1035716 2013-06-22 14:52:29 +02:00
libpostproc postprocess_template: put rsp on the clobber list to prevent gcc from using it in "q" 2013-06-16 18:21:39 +02:00
libswresample swresample/x86/audio_convert: add emms to CONV 2013-06-18 02:26:36 +02:00
libswscale swscale: fix filter alignment reduction without inline asm 2013-06-21 21:01:11 +02:00
presets
tests lavu: Add RIPEMD hashing 2013-06-15 18:54:01 -03:00
tools tools/qt-faststart: Fix unintended sign extension of current_offset 2013-06-02 23:10:44 +02:00
.gitignore Rename ffadler to ffhash and expand it using the generic hash API 2013-05-16 17:58:56 +02:00
arch.mak
Changelog lavfi: add spp filter. 2013-06-14 01:27:22 +02:00
cmdutils_common_opts.h cmdutils_common_opts: fix indention of #if 2013-04-11 16:07:46 +02:00
cmdutils.c cmdutils: dont change the log level for -report 2013-06-24 02:59:05 +02:00
cmdutils.h Merge commit 'e19e8aeeaaff3d4bc8f6065764c93f0298782ac6' 2013-04-12 15:56:20 +02:00
common.mak Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975' 2013-03-28 12:12:38 +01:00
configure Merge commit 'ace87c19ed4c4882d7b9b3ce512c4c195e39a203' 2013-06-24 10:41:37 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS CREDITS: redirect to Git log, remove current outdated content 2013-01-31 18:02:52 +01:00
ffmpeg_filter.c Merge commit '72fbc9685c08baae7ab9996642707eaab873b6f1' 2013-05-10 22:51:04 +02:00
ffmpeg_opt.c ffmpeg: add -apad option which injects a apad filter only in the presence of video streams 2013-05-08 23:55:06 +02:00
ffmpeg.c Merge commit '42cc6cefd315c1556e2a52f7ebe2f766ec82b790' 2013-06-23 12:56:55 +02:00
ffmpeg.h ffmpeg: add -apad option which injects a apad filter only in the presence of video streams 2013-05-08 23:55:06 +02:00
ffplay.c ffplay: remove remains of the old audio and video clock VideoState variables 2013-06-17 01:18:07 +02:00
ffprobe.c ffprobe: show chapter and chapter metadata information 2013-06-06 16:49:53 +02:00
ffserver.c ffserver: fix null pointer dereference 2013-06-04 13:19:27 +02:00
INSTALL
library.mak Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975' 2013-03-28 12:12:38 +01:00
LICENSE lavfi: add spp filter. 2013-06-14 01:27:22 +02:00
MAINTAINERS Add maintainer for WebVTT demuxer and muxer 2013-06-18 18:02:30 +02:00
Makefile Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d' 2013-05-24 13:01:41 +02:00
README
RELEASE RELEASE: 1.1.git for master 2013-01-06 21:42:35 +01: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.