Set channel layout for 4 and 5.1 channel cdata audio files

[ffmpeg] / libavformat / iv8.c

diff --git a/libavformat/iv8.c b/libavformat/iv8.c
index 07659cf8f565be4a8b865f06f499eab7eaa785b1..df5eb116c1f1e722f9c57af426dbf46437cbe9bc 100644 (file)
--- a/libavformat/iv8.c
+++ b/libavformat/iv8.c
@@ -57,20 +57,20 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
 {
     int ret, size, pts, type;
 retry:
-    type= get_be16(s->pb); // 257 or 258
-    size= get_be16(s->pb);
+    type= avio_rb16(s->pb); // 257 or 258
+    size= avio_rb16(s->pb);
 
-    get_be16(s->pb); //some flags, 0x80 indicates end of frame
-    get_be16(s->pb); //packet number
-    pts=get_be32(s->pb);
-    get_be32(s->pb); //6A 13 E3 88
+    avio_rb16(s->pb); //some flags, 0x80 indicates end of frame
+    avio_rb16(s->pb); //packet number
+    pts=avio_rb32(s->pb);
+    avio_rb32(s->pb); //6A 13 E3 88
 
     size -= 12;
     if(size<1)
         return -1;
 
     if(type==258){
-        url_fskip(s->pb, size);
+        avio_skip(s->pb, size);
         goto retry;
     }