summaryrefslogtreecommitdiff
path: root/libavformat/nut.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-03-05 13:06:49 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-03-05 13:06:49 +0000
commit1326621c1afe17758a8a92294c3cf4f2b621df9e (patch)
tree6c8a993decb5315d2c1ec9e36b3348d1f817e88b /libavformat/nut.c
parent73e2261318fd80150ce6fa995efe0ef397f4c35a (diff)
downloadffmpeg-1326621c1afe17758a8a92294c3cf4f2b621df9e.tar.gz
Subtitle support. (untested)
Originally committed as revision 12330 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/nut.c')
-rw-r--r--libavformat/nut.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/libavformat/nut.c b/libavformat/nut.c
index fdcaac6a3e..4f6d319dc7 100644
--- a/libavformat/nut.c
+++ b/libavformat/nut.c
@@ -22,6 +22,14 @@
#include "nut.h"
#include "tree.h"
+const AVCodecTag ff_nut_subtitle_tags[] = {
+ { CODEC_ID_TEXT , MKTAG('U', 'T', 'F', '8') },
+ { CODEC_ID_SSA , MKTAG('S', 'S', 'A', 0 ) },
+ { CODEC_ID_DVD_SUBTITLE, MKTAG('D', 'V', 'D', 'S') },
+ { CODEC_ID_DVB_SUBTITLE, MKTAG('D', 'V', 'B', 'S') },
+ { CODEC_ID_NONE , 0 }
+};
+
void ff_nut_reset_ts(NUTContext *nut, AVRational time_base, int64_t val){
int i;
for(i=0; i<nut->avf->nb_streams; i++){