[FFmpeg-cvslog] g2m: Relax resolution change constraints
Vittorio Giovara
git at videolan.org
Sat Oct 10 09:20:04 CEST 2015
ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Wed Oct 7 15:16:44 2015 +0200| [3a4d369ea4ded91b1178ae6e2ff0ab9ea470e344] | committer: Luca Barbato
g2m: Relax resolution change constraints
Do not fail when original resolution is smaller than current one,
as the frame buffer is resized automatically.
Signed-off-by: Vittorio Giovara <vittorio.giovara at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3a4d369ea4ded91b1178ae6e2ff0ab9ea470e344
---
libavcodec/g2meet.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c
index 85f53e2..a89610d 100644
--- a/libavcodec/g2meet.c
+++ b/libavcodec/g2meet.c
@@ -1410,8 +1410,7 @@ static int g2m_decode_frame(AVCodecContext *avctx, void *data,
}
c->width = bytestream2_get_be32(&bc);
c->height = bytestream2_get_be32(&bc);
- if (c->width < 16 || c->width > c->orig_width ||
- c->height < 16 || c->height > c->orig_height) {
+ if (c->width < 16 || c->height < 16) {
av_log(avctx, AV_LOG_ERROR,
"Invalid frame dimensions %dx%d\n",
c->width, c->height);
More information about the ffmpeg-cvslog
mailing list