[FFmpeg-cvslog] au: return AVERROR codes instead of -1
Justin Ruggles
git at videolan.org
Thu Jan 10 12:32:42 CET 2013
ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Sun Dec 23 15:06:46 2012 -0500| [2f8207b1c605dd53498b50ce80c4b92395829e05] | committer: Justin Ruggles
au: return AVERROR codes instead of -1
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2f8207b1c605dd53498b50ce80c4b92395829e05
---
libavformat/au.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/libavformat/au.c b/libavformat/au.c
index d88ccfc..488e2b0 100644
--- a/libavformat/au.c
+++ b/libavformat/au.c
@@ -69,7 +69,7 @@ static int au_read_header(AVFormatContext *s)
tag = avio_rl32(pb);
if (tag != MKTAG('.', 's', 'n', 'd'))
- return -1;
+ return AVERROR_INVALIDDATA;
size = avio_rb32(pb); /* header size */
avio_rb32(pb); /* data size */
@@ -107,7 +107,7 @@ static int au_read_header(AVFormatContext *s)
st = avformat_new_stream(s, NULL);
if (!st)
- return -1;
+ return AVERROR(ENOMEM);
st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
st->codec->codec_tag = id;
st->codec->codec_id = codec;
@@ -160,7 +160,7 @@ AVInputFormat ff_au_demuxer = {
static int put_au_header(AVIOContext *pb, AVCodecContext *enc)
{
if (!enc->codec_tag)
- return -1;
+ return AVERROR(EINVAL);
ffio_wfourcc(pb, ".snd"); /* magic number */
avio_wb32(pb, 24); /* header size */
@@ -175,11 +175,12 @@ static int put_au_header(AVIOContext *pb, AVCodecContext *enc)
static int au_write_header(AVFormatContext *s)
{
AVIOContext *pb = s->pb;
+ int ret;
s->priv_data = NULL;
- if (put_au_header(pb, s->streams[0]->codec) < 0)
- return -1;
+ if ((ret = put_au_header(pb, s->streams[0]->codec)) < 0)
+ return ret;
avio_flush(pb);
More information about the ffmpeg-cvslog
mailing list