X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fsol.c;h=fd7eb662fca200df684f71ded71ffc214e6b96df;hb=83120e3bd71457bdbe02785ac0adc74d7c34b219;hp=824e56ea280c2dceb1e45fe4c747fa74ef8846bf;hpb=e6b22522c94cfccda97018e52ab65da8c69d8a56;p=ffmpeg

diff --git a/libavformat/sol.c b/libavformat/sol.c
index 824e56ea280..fd7eb662fca 100644
--- a/libavformat/sol.c
+++ b/libavformat/sol.c
@@ -25,7 +25,7 @@
 
 #include "libavutil/bswap.h"
 #include "avformat.h"
-#include "raw.h"
+#include "pcm.h"
 
 /* if we don't know the size in advance */
 #define AU_UNKNOWN_SIZE ((uint32_t)(~0))
@@ -34,7 +34,7 @@ static int sol_probe(AVProbeData *p)
 {
     /* check file header */
     uint16_t magic;
-    magic=le2ne_16(*((uint16_t*)p->buf));
+    magic=av_le2ne16(*((uint16_t*)p->buf));
     if ((magic == 0x0B8D || magic == 0x0C0D || magic == 0x0C8D) &&
         p->buf[2] == 'S' && p->buf[3] == 'O' &&
         p->buf[4] == 'L' && p->buf[5] == 0)
@@ -141,7 +141,7 @@ static int sol_read_packet(AVFormatContext *s,
     return 0;
 }
 
-AVInputFormat sol_demuxer = {
+AVInputFormat ff_sol_demuxer = {
     "sol",
     NULL_IF_CONFIG_SMALL("Sierra SOL format"),
     0,