Imported Debian version 2.5.0~trusty1.1

[deb_ffmpeg.git] / ffmpeg / libavcodec / shorten.c

diff --git a/ffmpeg/libavcodec/shorten.c b/ffmpeg/libavcodec/shorten.c
index 5c4bf816b9e345f3ae02f6299f3879cda8f93e90..4c9cc0636c1b3a5c2dbd2fcf75bdb400b040c060 100644 (file)
--- a/ffmpeg/libavcodec/shorten.c
+++ b/ffmpeg/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;