summaryrefslogtreecommitdiff
path: root/libavformat/nut.c
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2012-10-25 14:05:40 +0200
committerLuca Barbato <lu_zero@gentoo.org>2012-10-29 12:03:28 +0100
commitd4bff9f1ab59f4ae58841bd7b056f2ff1b8854d7 (patch)
tree1f57fef0411d5b6fee53811db0cef9bdead80dc7 /libavformat/nut.c
parent07585ffa62eebebcd35326935fec7cd948021daf (diff)
nut: support textual data
Plain text (utf8 encoded) data can be muxed and demuxed in nut.
Diffstat (limited to 'libavformat/nut.c')
-rw-r--r--libavformat/nut.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/libavformat/nut.c b/libavformat/nut.c
index e367d1c649..85b126b3b1 100644
--- a/libavformat/nut.c
+++ b/libavformat/nut.c
@@ -33,6 +33,11 @@ const AVCodecTag ff_nut_subtitle_tags[] = {
{ AV_CODEC_ID_NONE , 0 }
};
+const AVCodecTag ff_nut_data_tags[] = {
+ { AV_CODEC_ID_TEXT , MKTAG('U', 'T', 'F', '8') },
+ { AV_CODEC_ID_NONE , 0 }
+};
+
const AVCodecTag ff_nut_video_tags[] = {
{ AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 15 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 15 ) },
@@ -117,7 +122,7 @@ const AVCodecTag ff_nut_audio_tags[] = {
const AVCodecTag * const ff_nut_codec_tags[] = {
ff_nut_video_tags, ff_nut_audio_tags, ff_nut_subtitle_tags,
- ff_codec_bmp_tags, ff_codec_wav_tags, 0
+ ff_codec_bmp_tags, ff_codec_wav_tags, ff_nut_data_tags, 0
};
void ff_nut_reset_ts(NUTContext *nut, AVRational time_base, int64_t val){