Move the functions in h264pred.c into a new file h264pred_internal.h.

[ffmpeg] / libavformat / eacdata.c

diff --git a/libavformat/eacdata.c b/libavformat/eacdata.c
index 809b190dd1f6cc4caf26d61f28650768b295b7ea..7b109ff888cf36b17b62880a556b63a3298702f0 100644 (file)
--- a/libavformat/eacdata.c
+++ b/libavformat/eacdata.c
@@ -47,11 +47,11 @@ static int cdata_probe(AVProbeData *p)
 static int cdata_read_header(AVFormatContext *s, AVFormatParameters *ap)
 {
     CdataDemuxContext *cdata = s->priv_data;
-    ByteIOContext *pb = s->pb;
+    AVIOContext *pb = s->pb;
     unsigned int sample_rate, header;
     AVStream *st;
 
-    header = get_be16(pb);
+    header = avio_rb16(pb);
     switch (header) {
         case 0x0400: cdata->channels = 1; break;
         case 0x0404: cdata->channels = 2; break;
@@ -61,8 +61,8 @@ static int cdata_read_header(AVFormatContext *s, AVFormatParameters *ap)
             return -1;
     };
 
-    sample_rate = get_be16(pb);
-    url_fskip(pb, 12);
+    sample_rate = avio_rb16(pb);
+    avio_skip(pb, 12);
 
     st = av_new_stream(s, 0);
     if (!st)