RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'eafbc6716cede6d4a652f8bedf82f2901c68d06d' 

* commit 'eafbc6716cede6d4a652f8bedf82f2901c68d06d':
  vmnc: Delay pixel size check

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-05-20 18:31:55 +02:00
parent 6d1935d1b9 eafbc6716c
commit a4c7aeaf82
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavcodec/vmnc.c
View File

@ -432,10 +432,18 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
c->pic->pict_type = AV_PICTURE_TYPE_I;
depth = bytestream2_get_byte(gb);
if (depth != c->bpp) {
av_log(avctx, AV_LOG_INFO,
"Depth mismatch. Container %i bpp, "
"Frame data: %i bpp\n",
c->bpp, depth);
av_log(avctx, AV_LOG_WARNING, "Depth mismatch. "
"Container %i bpp / Codec %i bpp\n", c->bpp, depth);
if (depth != 8 && depth != 16 && depth != 32) {
av_log(avctx, AV_LOG_ERROR,
"Unsupported codec bitdepth %i\n", depth);
return AVERROR_INVALIDDATA;
}
/* reset values */
c->bpp = depth;
c->bpp2 = c->bpp / 8;
}
bytestream2_skip(gb, 1);
c->bigendian = bytestream2_get_byte(gb);
@ -537,6 +545,9 @@ static av_cold int decode_init(AVCodecContext *avctx)
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_0RGB32;
break;