Merge commit 'eafbc6716cede6d4a652f8bedf82f2901c68d06d'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 20 May 2015 16:31:55 +0000 (18:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 20 May 2015 16:41:43 +0000 (18:41 +0200)
* commit 'eafbc6716cede6d4a652f8bedf82f2901c68d06d':
  vmnc: Delay pixel size check

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/vmnc.c

@@@ -537,8 -532,11 +545,11 @@@ static av_cold int decode_init(AVCodecC
      case 16:
          avctx->pix_fmt = AV_PIX_FMT_RGB555;
          break;
+     case 24:
+         /* 24 bits is not technically supported, but some clients might
+          * mistakenly set it -- delay the actual check until decode_frame() */
      case 32:
 -        avctx->pix_fmt = AV_PIX_FMT_RGB32;
 +        avctx->pix_fmt = AV_PIX_FMT_0RGB32;
          break;
      default:
          av_log(avctx, AV_LOG_ERROR, "Unsupported bitdepth %i\n", c->bpp);