Remove ff_mms_set_stream_selection again from asf demuxer,

[ffmpeg] / libavformat / sol.c

diff --git a/libavformat/sol.c b/libavformat/sol.c
index 8c2ea4340e7bcbd25f95065bbac3150e85554741..97ebfdb5eb07d5955b8b8f7d32c9bd4957421319 100644 (file)
--- a/libavformat/sol.c
+++ b/libavformat/sol.c
@@ -24,19 +24,17 @@
  */
 
 #include "avformat.h"
-#include "allformats.h"
+#include "raw.h"
 #include "riff.h"
 #include "bswap.h"
 
 /* if we don't know the size in advance */
-#define AU_UNKOWN_SIZE ((uint32_t)(~0))
+#define AU_UNKNOWN_SIZE ((uint32_t)(~0))
 
 static int sol_probe(AVProbeData *p)
 {
     /* check file header */
     uint16_t magic;
-    if (p->buf_size <= 14)
-        return 0;
     magic=le2me_16(*((uint16_t*)p->buf));
     if ((magic == 0x0B8D || magic == 0x0C0D || magic == 0x0C8D) &&
         p->buf[2] == 'S' && p->buf[3] == 'O' &&
@@ -90,7 +88,7 @@ static int sol_read_header(AVFormatContext *s,
 {
     int size;
     unsigned int magic,tag;
-    ByteIOContext *pb = &s->pb;
+    ByteIOContext *pb = s->pb;
     unsigned int id, codec, channels, rate, type;
     AVStream *st;
 
@@ -132,9 +130,9 @@ static int sol_read_packet(AVFormatContext *s,
 {
     int ret;
 
-    if (url_feof(&s->pb))
+    if (url_feof(s->pb))
         return AVERROR(EIO);
-    ret= av_get_packet(&s->pb, pkt, MAX_SIZE);
+    ret= av_get_packet(s->pb, pkt, MAX_SIZE);
     pkt->stream_index = 0;
 
     /* note: we need to modify the packet size here to handle the last