Remove ff_mms_set_stream_selection again from asf demuxer,
it does not seem like a good solution to the problem and will cause dependency problems if a libavprotocols should be split out. Originally committed as revision 11827 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
ed5d7a531c
commit
7abe438045
@ -108,14 +108,6 @@ static void get_str16(ByteIOContext *pb, char *buf, int buf_size)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_MMSH_PROTOCOL
|
|
||||||
static int is_mms(ByteIOContext *pb)
|
|
||||||
{
|
|
||||||
return url_fileno(pb) && url_fileno(pb)->prot &&
|
|
||||||
!strcmp(url_fileno(pb)->prot->name, "mmsh");
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static void get_str16_nolen(ByteIOContext *pb, int len, char *buf, int buf_size)
|
static void get_str16_nolen(ByteIOContext *pb, int len, char *buf, int buf_size)
|
||||||
{
|
{
|
||||||
char* q = buf;
|
char* q = buf;
|
||||||
@ -548,12 +540,6 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_MMSH_PROTOCOL
|
|
||||||
/* Give info about ourselves to the mms protocol */
|
|
||||||
if(is_mms(pb))
|
|
||||||
ff_mms_set_stream_selection(url_fileno(pb), s);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
fail:
|
fail:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user