arm: get_cabac inline asm

[ffmpeg] / libavformat / eacdata.c

diff --git a/libavformat/eacdata.c b/libavformat/eacdata.c
index 56f4e271dd52ac67d08cfaed77bceaef609f0862..b56ba1c90cd24600f71389562f9564d5c027c567 100644 (file)
--- a/libavformat/eacdata.c
+++ b/libavformat/eacdata.c
@@ -29,6 +29,7 @@
  */
 
 #include "avformat.h"
+#include "internal.h"
 
 typedef struct {
   unsigned int channels;
@@ -44,7 +45,7 @@ static int cdata_probe(AVProbeData *p)
     return 0;
 }
 
-static int cdata_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int cdata_read_header(AVFormatContext *s)
 {
     CdataDemuxContext *cdata = s->priv_data;
     AVIOContext *pb = s->pb;
@@ -64,15 +65,15 @@ static int cdata_read_header(AVFormatContext *s, AVFormatParameters *ap)
     sample_rate = avio_rb16(pb);
     avio_skip(pb, 12);
 
-    st = av_new_stream(s, 0);
+    st = avformat_new_stream(s, NULL);
     if (!st)
         return AVERROR(ENOMEM);
     st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
     st->codec->codec_tag = 0; /* no fourcc */
-    st->codec->codec_id = CODEC_ID_ADPCM_EA_XAS;
+    st->codec->codec_id = AV_CODEC_ID_ADPCM_EA_XAS;
     st->codec->channels = cdata->channels;
     st->codec->sample_rate = sample_rate;
-    av_set_pts_info(st, 64, 1, sample_rate);
+    avpriv_set_pts_info(st, 64, 1, sample_rate);
 
     cdata->audio_pts = 0;
     return 0;