[SCM] libav/experimental: vc1test: Return proper error codes
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Aug 10 16:03:43 UTC 2014
The following commit has been merged in the experimental branch:
commit 77fc7b76726719746ca45df6c4a62c41abad506e
Author: Nidhi Makhijani <nidhimj22 at gmail.com>
Date: Sun Jul 6 00:28:56 2014 +0530
vc1test: Return proper error codes
Signed-off-by: Diego Biurrun <diego at biurrun.de>
diff --git a/libavformat/vc1test.c b/libavformat/vc1test.c
index 859188f..8fabf7d 100644
--- a/libavformat/vc1test.c
+++ b/libavformat/vc1test.c
@@ -51,12 +51,12 @@ static int vc1t_read_header(AVFormatContext *s)
frames = avio_rl24(pb);
if(avio_r8(pb) != 0xC5 || avio_rl32(pb) != 4)
- return -1;
+ return AVERROR_INVALIDDATA;
/* init video codec */
st = avformat_new_stream(s, NULL);
if (!st)
- return -1;
+ return AVERROR(ENOMEM);
st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
st->codec->codec_id = AV_CODEC_ID_WMV3;
@@ -67,7 +67,7 @@ static int vc1t_read_header(AVFormatContext *s)
st->codec->height = avio_rl32(pb);
st->codec->width = avio_rl32(pb);
if(avio_rl32(pb) != 0xC)
- return -1;
+ return AVERROR_INVALIDDATA;
avio_skip(pb, 8);
fps = avio_rl32(pb);
if(fps == 0xFFFFFFFF)
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list