diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-06 23:59:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-06 23:59:35 +0100 |
| commit | 7b018e5c8d182b0272477322377b8daafa1c970f (patch) | |
| tree | 8f526f00d6352279d84ff8c7bcfbb2f78f702bd1 /libavcodec/yop.c | |
| parent | 61904467458b16cf89530e2d0875f3786001dc11 (diff) | |
| parent | 84f2847de394ac447f53306bd4dd73e1af6ea5e4 (diff) | |
| download | ffmpeg-7b018e5c8d182b0272477322377b8daafa1c970f.tar.gz | |
Merge commit '84f2847de394ac447f53306bd4dd73e1af6ea5e4'
* commit '84f2847de394ac447f53306bd4dd73e1af6ea5e4':
xl: return a meaningful error code.
xan: return a meaningful error code.
xxan: return meaningful error codes.
zmbv: return more meaningful error codes.
yop: use a meaningful error code.
c93: return meaningful error codes.
bmv: return meaningful error codes.
bmp: return meaningful error codes.
bink: operate with pointers to AVFrames instead of whole structs.
bink: return meaningful error codes.
bfi: return meaningful error codes.
bethsoftvideo: return meaningful error codes.
Conflicts:
libavcodec/c93.c
libavcodec/xl.c
libavcodec/xxan.c
libavcodec/yop.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/yop.c')
| -rw-r--r-- | libavcodec/yop.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/yop.c b/libavcodec/yop.c index 337fb88365..c47f5ec14f 100644 --- a/libavcodec/yop.c +++ b/libavcodec/yop.c @@ -85,7 +85,8 @@ static av_cold int yop_decode_init(AVCodecContext *avctx) if (avctx->width & 1 || avctx->height & 1 || av_image_check_size(avctx->width, avctx->height, 0, avctx) < 0) { - return -1; + av_log(avctx, AV_LOG_ERROR, "YOP has invalid dimensions\n"); + return AVERROR_INVALIDDATA; } if (!avctx->extradata) { |