diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-06 23:47:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-06 23:47:10 +0100 |
| commit | 90f8b2ce48cfbffeb64779a8c2d55a1e078b4657 (patch) | |
| tree | a077687783a032b52a7b03a9f63d29925d516568 /libavcodec | |
| parent | 09131ebb562472effd81726c2c14c3ec7164b695 (diff) | |
| parent | 4c364eb2b856fc33cf7b42f7c7b979e69fde5f3a (diff) | |
| download | ffmpeg-90f8b2ce48cfbffeb64779a8c2d55a1e078b4657.tar.gz | |
Merge commit '4c364eb2b856fc33cf7b42f7c7b979e69fde5f3a'
* commit '4c364eb2b856fc33cf7b42f7c7b979e69fde5f3a':
shorten: report meaningful errors
Conflicts:
libavcodec/shorten.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/shorten.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c index 77c7a2304d..82cc06cf1c 100644 --- a/libavcodec/shorten.c +++ b/libavcodec/shorten.c @@ -243,7 +243,7 @@ static int decode_wave_header(AVCodecContext *avctx, const uint8_t *header, break; default: av_log(avctx, AV_LOG_ERROR, "unsupported wave format\n"); - return AVERROR_PATCHWELCOME; + return AVERROR(ENOSYS); } header += 2; // skip channels (already got from shorten header) @@ -255,7 +255,7 @@ static int decode_wave_header(AVCodecContext *avctx, const uint8_t *header, if (bps != 16 && bps != 8) { av_log(avctx, AV_LOG_ERROR, "unsupported number of bits per sample: %d\n", bps); - return AVERROR_INVALIDDATA; + return AVERROR(ENOSYS); } len -= 16; |