diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-24 15:09:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-24 15:09:58 +0100 |
| commit | d69238e991844cb0e9407c26e64dd7a551aa5bab (patch) | |
| tree | a6169232d84d75370f66dcf011f8d7ee45594f8a /libavcodec/wmaprodec.c | |
| parent | c6664242e0700ea0bc10109c7e84c3f9cf7fb9ae (diff) | |
| parent | f3298f12997eb4b7ad203766f768f92e3dd72a2a (diff) | |
Merge commit 'f3298f12997eb4b7ad203766f768f92e3dd72a2a'
* commit 'f3298f12997eb4b7ad203766f768f92e3dd72a2a':
Return proper error code after av_log_ask_for_sample()
configure: cosmetics: Separate hwaccel dependencies from decoders/encoders
oggdec: check memory allocation
Conflicts:
configure
libavcodec/pictordec.c
libavformat/anm.c
libavformat/oggdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmaprodec.c')
| -rw-r--r-- | libavcodec/wmaprodec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c index 3c1ca48f9f..41e07aa5f8 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -299,7 +299,7 @@ static av_cold int decode_init(AVCodecContext *avctx) } else { av_log_ask_for_sample(avctx, "Unknown extradata size\n"); - return AVERROR_INVALIDDATA; + return AVERROR_PATCHWELCOME; } /** generic init */ @@ -690,7 +690,7 @@ static int decode_channel_transform(WMAProDecodeCtx* s) if (get_bits1(&s->gb)) { av_log_ask_for_sample(s->avctx, "unsupported channel transform bit\n"); - return AVERROR_INVALIDDATA; + return AVERROR_PATCHWELCOME; } for (s->num_chgroups = 0; remaining_channels && @@ -1160,7 +1160,7 @@ static int decode_subframe(WMAProDecodeCtx *s) /** no idea for what the following bit is used */ if (get_bits1(&s->gb)) { av_log_ask_for_sample(s->avctx, "reserved bit set\n"); - return AVERROR_INVALIDDATA; + return AVERROR_PATCHWELCOME; } |