Improve channel count and bitrate error handling in wmav* encode_init()

[ffmpeg] / libavformat / xa.c

diff --git a/libavformat/xa.c b/libavformat/xa.c
index 6576c527809d7afa18db79a2688aeb9665c224b5..3b6a77f4af46aefaf0106aa6cf3c15537dc317b7 100644 (file)
--- a/libavformat/xa.c
+++ b/libavformat/xa.c
@@ -20,7 +20,7 @@
  */
 
 /**
- * @file libavformat/xa.c
+ * @file
  * Maxis XA File Demuxer
  * by Robert Marston (rmarston@gmail.com)
  * for more information on the XA audio format see
@@ -66,7 +66,7 @@ static int xa_read_header(AVFormatContext *s,
                AVFormatParameters *ap)
 {
     MaxisXADemuxContext *xa = s->priv_data;
-    ByteIOContext *pb = s->pb;
+    AVIOContext *pb = s->pb;
     AVStream *st;
 
     /*Set up the XA Audio Decoder*/
@@ -76,15 +76,15 @@ static int xa_read_header(AVFormatContext *s,
 
     st->codec->codec_type   = AVMEDIA_TYPE_AUDIO;
     st->codec->codec_id     = CODEC_ID_ADPCM_EA_MAXIS_XA;
-    url_fskip(pb, 4);       /* Skip the XA ID */
-    xa->out_size            =  get_le32(pb);
-    url_fskip(pb, 2);       /* Skip the tag */
-    st->codec->channels     = get_le16(pb);
-    st->codec->sample_rate  = get_le32(pb);
+    avio_skip(pb, 4);       /* Skip the XA ID */
+    xa->out_size            =  avio_rl32(pb);
+    avio_skip(pb, 2);       /* Skip the tag */
+    st->codec->channels     = avio_rl16(pb);
+    st->codec->sample_rate  = avio_rl32(pb);
     /* Value in file is average byte rate*/
-    st->codec->bit_rate     = get_le32(pb) * 8;
-    st->codec->block_align  = get_le16(pb);
-    st->codec->bits_per_coded_sample = get_le16(pb);
+    st->codec->bit_rate     = avio_rl32(pb) * 8;
+    st->codec->block_align  = avio_rl16(pb);
+    st->codec->bits_per_coded_sample = avio_rl16(pb);
 
     av_set_pts_info(st, 64, 1, st->codec->sample_rate);
 
@@ -96,7 +96,7 @@ static int xa_read_packet(AVFormatContext *s,
 {
     MaxisXADemuxContext *xa = s->priv_data;
     AVStream *st = s->streams[0];
-    ByteIOContext *pb = s->pb;
+    AVIOContext *pb = s->pb;
     unsigned int packet_size;
     int ret;
 
@@ -118,7 +118,7 @@ static int xa_read_packet(AVFormatContext *s,
     return ret;
 }
 
-AVInputFormat xa_demuxer = {
+AVInputFormat ff_xa_demuxer = {
     "xa",
     NULL_IF_CONFIG_SMALL("Maxis XA File Format"),
     sizeof(MaxisXADemuxContext),