Merge commit '4c364eb2b856fc33cf7b42f7c7b979e69fde5f3a'

* commit '4c364eb2b856fc33cf7b42f7c7b979e69fde5f3a':
  shorten: report meaningful errors

Conflicts:
	libavcodec/shorten.c

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

diff --cc libavcodec/shorten.c
index 77c7a23,dd35516..82cc06c
--- 1/libavcodec/shorten.c
--- 2/libavcodec/shorten.c
+++ b/libavcodec/shorten.c
@@@ -250,12 -240,11 +250,12 @@@ static int decode_wave_header(AVCodecCo
      avctx->sample_rate = bytestream_get_le32(&header);
      header += 4;        // skip bit rate    (represents original uncompressed bit rate)
      header += 2;        // skip block align (not needed)
 -    avctx->bits_per_coded_sample = bytestream_get_le16(&header);
 +    bps     = bytestream_get_le16(&header);
 +    avctx->bits_per_coded_sample = bps;
  
 -    if (avctx->bits_per_coded_sample != 16) {
 -        av_log(avctx, AV_LOG_ERROR, "unsupported number of bits per sample\n");
 +    if (bps != 16 && bps != 8) {
 +        av_log(avctx, AV_LOG_ERROR, "unsupported number of bits per sample: %d\n", bps);
-         return AVERROR_INVALIDDATA;
+         return AVERROR(ENOSYS);
      }
  
      len -= 16;