diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-06 19:24:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-06 19:25:12 +0200 |
| commit | d95a04547a3238aef9a344484c9c49b5d4681ccb (patch) | |
| tree | 03c4d6b7891c052fe62be27542ca51474f3034c9 /libavformat | |
| parent | 1c8c4b8a89b91c60b6c1687241e9cbf64e8949a5 (diff) | |
| parent | 77fc7b76726719746ca45df6c4a62c41abad506e (diff) | |
| download | ffmpeg-d95a04547a3238aef9a344484c9c49b5d4681ccb.tar.gz | |
Merge commit '77fc7b76726719746ca45df6c4a62c41abad506e'
* commit '77fc7b76726719746ca45df6c4a62c41abad506e':
vc1test: Return proper error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/vc1test.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/vc1test.c b/libavformat/vc1test.c index e5303fa46e..e9246669a0 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; @@ -66,7 +66,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) |