virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

factorize

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

9
libavformat/nutdec.c
View File

@ -315,20 +315,14 @@ static int decode_stream_header(NUTContext *nut){
case 0:
st->codec->codec_type = CODEC_TYPE_VIDEO;
st->codec->codec_id = codec_get_id(codec_bmp_tags, tmp);
if (st->codec->codec_id == CODEC_ID_NONE)
av_log(s, AV_LOG_ERROR, "Unknown codec?!\n");
break;
case 1:
st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->codec_id = codec_get_id(codec_wav_tags, tmp);
if (st->codec->codec_id == CODEC_ID_NONE)
av_log(s, AV_LOG_ERROR, "Unknown codec?!\n");
break;
case 2:
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;
@ -337,6 +331,9 @@ static int decode_stream_header(NUTContext *nut){
av_log(s, AV_LOG_ERROR, "unknown stream class (%d)\n", class);
return -1;
}
if(class<3 && st->codec->codec_id == CODEC_ID_NONE)
av_log(s, AV_LOG_ERROR, "Unknown codec?!\n");
GET_V(stc->time_base_id , tmp < nut->time_base_count);
GET_V(stc->msb_pts_shift , tmp < 16);
stc->max_pts_distance= ff_get_v(bc);