Merge commit '8e104619a627fcf5f4c2bd3c09d0c2d323aae745'

* commit '8e104619a627fcf5f4c2bd3c09d0c2d323aae745':
  shorten: check for return value

Conflicts:
	libavcodec/shorten.c

See: e20ebe491c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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;