diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-13 23:17:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-13 23:23:01 +0100 |
| commit | e1f37c48e54f98d34f8a032e1d96f7a135a8545d (patch) | |
| tree | 74c11781b08a32228c081d6e679d778b6ac686a5 /doc/general.texi | |
| parent | fa4bb7c5b249da60cd16113b795a64f0055ef164 (diff) | |
| parent | 247e370e2a913db52ca079b347a174c8d393b171 (diff) | |
| download | ffmpeg-e1f37c48e54f98d34f8a032e1d96f7a135a8545d.tar.gz | |
Merge commit '247e370e2a913db52ca079b347a174c8d393b171'
* commit '247e370e2a913db52ca079b347a174c8d393b171':
TDSC decoder
Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/general.texi')
| -rw-r--r-- | doc/general.texi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/general.texi b/doc/general.texi index 6c9531b03e..38ae84a098 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -466,6 +466,7 @@ library: @item SoX native format @tab X @tab X @item SUN AU format @tab X @tab X @item SUP raw PGS subtitles @tab @tab X +@item TDSC @tab @tab X @item Text files @tab @tab X @item THP @tab @tab X @tab Used on the Nintendo GameCube. |