summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libavformat/nutdec.c7
-rw-r--r--libavformat/nutenc.c2
2 files changed, 6 insertions, 3 deletions
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index e072e7ed76..e584ac521d 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -325,8 +325,11 @@ static int decode_stream_header(NUTContext *nut){
av_log(s, AV_LOG_ERROR, "Unknown codec?!\n");
break;
case 2:
-// st->codec->codec_type = CODEC_TYPE_TEXT;
-// break;
+ st->codec->codec_type = CODEC_TYPE_SUBTITLE;
+// st->codec->codec_id = codec_get_id(codec_wav_tags, tmp); FIXME
+ if (st->codec->codec_id == CODEC_ID_NONE)
+ av_log(s, AV_LOG_ERROR, "Unknown codec?!\n");
+ break;
case 3:
st->codec->codec_type = CODEC_TYPE_DATA;
break;
diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c
index 5c0975c281..7ed02573a2 100644
--- a/libavformat/nutenc.c
+++ b/libavformat/nutenc.c
@@ -394,7 +394,7 @@ static int write_streamheader(NUTContext *nut, ByteIOContext *bc, AVCodecContext
switch(codec->codec_type){
case CODEC_TYPE_VIDEO: put_v(bc, 0); break;
case CODEC_TYPE_AUDIO: put_v(bc, 1); break;
-// case CODEC_TYPE_TEXT : put_v(bc, 2); break;
+ case CODEC_TYPE_SUBTITLE: put_v(bc, 2); break;
default : put_v(bc, 3); break;
}
put_v(bc, 4);