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/ptx.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/ptx.c')
| -rw-r--r-- | libavcodec/ptx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/ptx.c b/libavcodec/ptx.c index 91231a8baa..720dad1b94 100644 --- a/libavcodec/ptx.c +++ b/libavcodec/ptx.c @@ -57,7 +57,7 @@ static int ptx_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, if (bytes_per_pixel != 2) { av_log_ask_for_sample(avctx, "Image format is not RGB15.\n"); - return -1; + return AVERROR_PATCHWELCOME; } avctx->pix_fmt = AV_PIX_FMT_BGR555LE; |