put_flush_packet(&s->pb);
return 0;
}
-
-static int amr_write_trailer(AVFormatContext *s)
-{
- return 0;
-}
#endif /* CONFIG_MUXERS */
static int amr_probe(AVProbeData *p)
//This will also trigger multichannel files: "#!AMR_MC1.0\n" and
//"#!AMR-WB_MC1.0\n" (not supported)
- if (p->buf_size < 5)
- return 0;
if(memcmp(p->buf,AMR_header,5)==0)
return AVPROBE_SCORE_MAX;
else
st = av_new_stream(s, 0);
if (!st)
{
- return AVERROR_NOMEM;
+ return AVERROR(ENOMEM);
}
if(memcmp(header,AMR_header,6)!=0)
{
return 0;
}
-#define MAX_SIZE 32
-
static int amr_read_packet(AVFormatContext *s,
AVPacket *pkt)
{
AVCodecContext *enc = s->streams[0]->codec;
- int read, size, toc, mode;
+ int read, size = 0, toc, mode;
if (url_feof(&s->pb))
{
- return AVERROR_IO;
+ return AVERROR(EIO);
}
//FIXME this is wrong, this should rather be in a AVParset
if ( (size==0) || av_new_packet(pkt, size))
{
- return AVERROR_IO;
+ return AVERROR(EIO);
}
pkt->stream_index = 0;
if (read != size-1)
{
av_free_packet(pkt);
- return AVERROR_IO;
+ return AVERROR(EIO);
}
return 0;
}
-static int amr_read_close(AVFormatContext *s)
-{
- return 0;
-}
-
#ifdef CONFIG_AMR_DEMUXER
AVInputFormat amr_demuxer = {
"amr",
amr_probe,
amr_read_header,
amr_read_packet,
- amr_read_close,
+ NULL,
};
#endif
CODEC_ID_NONE,
amr_write_header,
amr_write_packet,
- amr_write_trailer,
};
#endif