diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-14 12:42:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-14 12:42:59 +0200 |
| commit | 8d403d9c89febcbca094206a866c82426fbcd1c8 (patch) | |
| tree | 67e2009cc7b4e6690da257f8a173bbdea1543185 /libavformat | |
| parent | de7b08cbc1c11482405504e76f402e5c32b60f22 (diff) | |
| parent | 0528226a05cc08b74197547fba0b1939bf68990d (diff) | |
| download | ffmpeg-8d403d9c89febcbca094206a866c82426fbcd1c8.tar.gz | |
Merge commit '0528226a05cc08b74197547fba0b1939bf68990d'
* commit '0528226a05cc08b74197547fba0b1939bf68990d':
a64: Return correct error code on invalid data stream
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/a64.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/a64.c b/libavformat/a64.c index 802235f404..03679b2838 100644 --- a/libavformat/a64.c +++ b/libavformat/a64.c @@ -37,7 +37,7 @@ static int a64_write_header(AVFormatContext *s) if (avctx->extradata_size < 4) { av_log(s, AV_LOG_ERROR, "Missing extradata\n"); - return AVERROR(EINVAL); + return AVERROR_INVALIDDATA; } switch (avctx->codec->id) { @@ -52,7 +52,7 @@ static int a64_write_header(AVFormatContext *s) header[4] = 3; break; default: - return AVERROR(EINVAL); + return AVERROR_INVALIDDATA; } avio_write(s->pb, header, 2); return 0; |