har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

subtitles (codec tag tables still missing ...)

Browse Source 
Originally committed as revision 12292 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2008-03-02 23:11:36 +00:00
parent c6eed369d2
commit a048febdc4
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/nutdec.c
View File

@ -325,8 +325,11 @@ static int decode_stream_header(NUTContext *nut){
av_log(s, AV_LOG_ERROR, "Unknown codec?!\n"); av_log(s, AV_LOG_ERROR, "Unknown codec?!\n");
break; break;
case 2: case 2:
// st->codec->codec_type = CODEC_TYPE_TEXT; st->codec->codec_type = CODEC_TYPE_SUBTITLE;
// break; // 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: case 3:
st->codec->codec_type = CODEC_TYPE_DATA; st->codec->codec_type = CODEC_TYPE_DATA;
break; break;

2
libavformat/nutenc.c
View File

@ -394,7 +394,7 @@ static int write_streamheader(NUTContext *nut, ByteIOContext *bc, AVCodecContext
switch(codec->codec_type){ switch(codec->codec_type){
case CODEC_TYPE_VIDEO: put_v(bc, 0); break; case CODEC_TYPE_VIDEO: put_v(bc, 0); break;
case CODEC_TYPE_AUDIO: put_v(bc, 1); 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; default : put_v(bc, 3); break;
} }
put_v(bc, 4); put_v(bc, 4);