Commit d3952510 authored by Hendrik Leppkes's avatar Hendrik Leppkes

Merge commit '3a4d369e'

* commit '3a4d369e':
  g2m: Relax resolution change constraints
Merged-by: 's avatarHendrik Leppkes <h.leppkes@gmail.com>
parents dab5f65b 3a4d369e
...@@ -1423,8 +1423,7 @@ static int g2m_decode_frame(AVCodecContext *avctx, void *data, ...@@ -1423,8 +1423,7 @@ static int g2m_decode_frame(AVCodecContext *avctx, void *data,
} }
c->width = bytestream2_get_be32(&bc); c->width = bytestream2_get_be32(&bc);
c->height = bytestream2_get_be32(&bc); c->height = bytestream2_get_be32(&bc);
if (c->width < 16 || c->width > c->orig_width || if (c->width < 16 || c->height < 16) {
c->height < 16 || c->height > c->orig_height) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"Invalid frame dimensions %dx%d\n", "Invalid frame dimensions %dx%d\n",
c->width, c->height); c->width, c->height);
......
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