RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-25 16:52:31 +00:00
Code Issues Projects Releases Wiki Activity

changes to ignore command media embedded in MS WMV files patch by ("Brown, Mike": mikeb, vibephone com)

Browse Source 
Originally committed as revision 4501 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Mike Brown 2005-08-10 23:41:20 +00:00 committed by Michael Niedermayer
parent 6870a440ce
commit ae38261ee8
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ffmpeg.c
View File

@ -3116,6 +3116,8 @@ static void opt_input_file(const char *filename)
break;
case CODEC_TYPE_SUBTITLE:
break;
case CODEC_TYPE_UNKNOWN:
break;
default:
av_abort();
}
@ -3163,6 +3165,7 @@ static void check_audio_video_inputs(int *has_video_ptr, int *has_audio_ptr)
has_video = 1;
break;
case CODEC_TYPE_DATA:
case CODEC_TYPE_UNKNOWN:
case CODEC_TYPE_SUBTITLE:
break;
default:

3
libavformat/asf.c
View File

@ -51,6 +51,7 @@ static void print_guid(const GUID *g)
else PRINT_IF_GUID(g, audio_conceal_none);
else PRINT_IF_GUID(g, video_stream);
else PRINT_IF_GUID(g, video_conceal_none);
else PRINT_IF_GUID(g, command_stream);
else PRINT_IF_GUID(g, comment_header);
else PRINT_IF_GUID(g, codec_comment_header);
else PRINT_IF_GUID(g, codec_comment1_header);
@ -204,6 +205,8 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap)
type = CODEC_TYPE_AUDIO;
} else if (!memcmp(&g, &video_stream, sizeof(GUID))) {
type = CODEC_TYPE_VIDEO;
} else if (!memcmp(&g, &command_stream, sizeof(GUID))) {
type = CODEC_TYPE_UNKNOWN;
} else {
goto fail;
}

3
libavformat/asf.h
View File

@ -165,6 +165,9 @@ static const GUID video_conceal_none = {
0x20FB5700, 0x5B55, 0x11CF, { 0xA8, 0xFD, 0x00, 0x80, 0x5F, 0x5C, 0x44, 0x2B },
};
static const GUID command_stream = {
0x59DACFC0, 0x59E6, 0x11D0, { 0xA3, 0xAC, 0x00, 0xA0, 0xC9, 0x03, 0x48, 0xF6 },
};
static const GUID comment_header = {
0x75b22633, 0x668e, 0x11cf, { 0xa6, 0xd9, 0x00, 0xaa, 0x00, 0x62, 0xce, 0x6c },