diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-13 14:21:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-13 14:21:58 +0100 |
| commit | ecb748866e00841e2e00e2c9c3438391a9e9e760 (patch) | |
| tree | 086ef75be3e04308b0b6fd6061a25189b0322a6b /libavcodec/shorten.c | |
| parent | 785f71fcd508113a4717bd6efcb2e0545b1c2e66 (diff) | |
| parent | 8e104619a627fcf5f4c2bd3c09d0c2d323aae745 (diff) | |
| download | ffmpeg-ecb748866e00841e2e00e2c9c3438391a9e9e760.tar.gz | |
Merge commit '8e104619a627fcf5f4c2bd3c09d0c2d323aae745'
* commit '8e104619a627fcf5f4c2bd3c09d0c2d323aae745':
shorten: check for return value
Conflicts:
libavcodec/shorten.c
See: e20ebe491c17388a312e04ff060c217ecfafc914
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/shorten.c')
| -rw-r--r-- | libavcodec/shorten.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c index 5c4bf816b9..4c9cc0636c 100644 --- a/libavcodec/shorten.c +++ b/libavcodec/shorten.c @@ -510,7 +510,7 @@ static int shorten_decode_frame(AVCodecContext *avctx, void *data, if (bitshift > 31) { av_log(avctx, AV_LOG_ERROR, "bitshift %d is invalid\n", bitshift); - return AVERROR_PATCHWELCOME; + return AVERROR_INVALIDDATA; } s->bitshift = bitshift; break; |