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 /libavformat/rsodec.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 'libavformat/rsodec.c')
| -rw-r--r-- | libavformat/rsodec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rsodec.c b/libavformat/rsodec.c index d8ed695fdf..aae80a8221 100644 --- a/libavformat/rsodec.c +++ b/libavformat/rsodec.c @@ -50,7 +50,7 @@ static int rso_read_header(AVFormatContext *s) bps = av_get_bits_per_sample(codec); if (!bps) { av_log_ask_for_sample(s, "could not determine bits per sample\n"); - return AVERROR_INVALIDDATA; + return AVERROR_PATCHWELCOME; } /* now we are ready: build format streams */ |