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/cinepak.c | |
| parent | c6664242e0700ea0bc10109c7e84c3f9cf7fb9ae (diff) | |
| parent | f3298f12997eb4b7ad203766f768f92e3dd72a2a (diff) | |
| download | ffmpeg-d69238e991844cb0e9407c26e64dd7a551aa5bab.tar.gz | |
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/cinepak.c')
| -rw-r--r-- | libavcodec/cinepak.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c index 9c6d290173..b323da4741 100644 --- a/libavcodec/cinepak.c +++ b/libavcodec/cinepak.c @@ -334,7 +334,7 @@ static int cinepak_decode (CinepakContext *s) if (s->sega_film_skip_bytes == -1) { if (!encoded_buf_size) { av_log_ask_for_sample(s->avctx, "encoded_buf_size is 0"); - return AVERROR_INVALIDDATA; + return AVERROR_PATCHWELCOME; } if (encoded_buf_size != s->size && (s->size % encoded_buf_size) != 0) { /* If the encoded frame size differs from the frame size as indicated |