Commit bebab211 authored by Hendrik Leppkes's avatar Hendrik Leppkes

Merge commit '9f732e4c'

* commit '9f732e4c':
  tiffenc: Check av_pix_fmt_desc_get() return value
Merged-by: 's avatarHendrik Leppkes <h.leppkes@gmail.com>
parents bbd0ebfd 9f732e4c
...@@ -265,6 +265,9 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, ...@@ -265,6 +265,9 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
s->subsampling[0] = 1; s->subsampling[0] = 1;
s->subsampling[1] = 1; s->subsampling[1] = 1;
if (!desc)
return AVERROR(EINVAL);
avctx->bits_per_coded_sample = avctx->bits_per_coded_sample =
s->bpp = av_get_bits_per_pixel(desc); s->bpp = av_get_bits_per_pixel(desc);
s->bpp_tab_size = desc->nb_components; s->bpp_tab_size = desc->nb_components;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment