[FFmpeg-cvslog] avcodec/mimic: Use ff_set_dimensions() to set the dimensions

2017-06-18 Thread Michael Niedermayer
ffmpeg | branch: release/3.1 | Michael Niedermayer  | 
Thu May 18 17:46:56 2017 +0200| [08375d37be071518526fc9001f07ecb32336268a] | 
committer: Michael Niedermayer

avcodec/mimic: Use ff_set_dimensions() to set the dimensions

Fixes: OOM
Fixes: 1671/clusterfuzz-testcase-minimized-4759078033162240

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer 
(cherry picked from commit e434840fd4b3c854beec845f950b80bc1bf93b60)
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=08375d37be071518526fc9001f07ecb32336268a
---

 libavcodec/mimic.c | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavcodec/mimic.c b/libavcodec/mimic.c
index ce649c602a..b77171a822 100644
--- a/libavcodec/mimic.c
+++ b/libavcodec/mimic.c
@@ -390,9 +390,11 @@ static int mimic_decode_frame(AVCodecContext *avctx, void 
*data,
 return AVERROR_INVALIDDATA;
 }
 
+res = ff_set_dimensions(avctx, width, height);
+if (res < 0)
+return res;
+
 ctx->avctx = avctx;
-avctx->width   = width;
-avctx->height  = height;
 avctx->pix_fmt = AV_PIX_FMT_YUV420P;
 for (i = 0; i < 3; i++) {
 ctx->num_vblocks[i] = AV_CEIL_RSHIFT(height,   3 + !!i);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog


[FFmpeg-cvslog] avcodec/mimic: Use ff_set_dimensions() to set the dimensions

2017-06-01 Thread Michael Niedermayer
ffmpeg | branch: release/3.3 | Michael Niedermayer  | 
Thu May 18 17:46:56 2017 +0200| [e46bc3052dc1286c5430a35f2259a09812d8ad7d] | 
committer: Michael Niedermayer

avcodec/mimic: Use ff_set_dimensions() to set the dimensions

Fixes: OOM
Fixes: 1671/clusterfuzz-testcase-minimized-4759078033162240

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer 
(cherry picked from commit e434840fd4b3c854beec845f950b80bc1bf93b60)
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e46bc3052dc1286c5430a35f2259a09812d8ad7d
---

 libavcodec/mimic.c | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavcodec/mimic.c b/libavcodec/mimic.c
index 61ce1ce584..70565af199 100644
--- a/libavcodec/mimic.c
+++ b/libavcodec/mimic.c
@@ -390,9 +390,11 @@ static int mimic_decode_frame(AVCodecContext *avctx, void 
*data,
 return AVERROR_INVALIDDATA;
 }
 
+res = ff_set_dimensions(avctx, width, height);
+if (res < 0)
+return res;
+
 ctx->avctx = avctx;
-avctx->width   = width;
-avctx->height  = height;
 avctx->pix_fmt = AV_PIX_FMT_YUV420P;
 for (i = 0; i < 3; i++) {
 ctx->num_vblocks[i] = AV_CEIL_RSHIFT(height,   3 + !!i);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog


[FFmpeg-cvslog] avcodec/mimic: Use ff_set_dimensions() to set the dimensions

2017-05-18 Thread Michael Niedermayer
ffmpeg | branch: master | Michael Niedermayer  | Thu 
May 18 17:46:56 2017 +0200| [e434840fd4b3c854beec845f950b80bc1bf93b60] | 
committer: Michael Niedermayer

avcodec/mimic: Use ff_set_dimensions() to set the dimensions

Fixes: OOM
Fixes: 1671/clusterfuzz-testcase-minimized-4759078033162240

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e434840fd4b3c854beec845f950b80bc1bf93b60
---

 libavcodec/mimic.c | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavcodec/mimic.c b/libavcodec/mimic.c
index 607dffa4a5..02d8b30e31 100644
--- a/libavcodec/mimic.c
+++ b/libavcodec/mimic.c
@@ -390,9 +390,11 @@ static int mimic_decode_frame(AVCodecContext *avctx, void 
*data,
 return AVERROR_INVALIDDATA;
 }
 
+res = ff_set_dimensions(avctx, width, height);
+if (res < 0)
+return res;
+
 ctx->avctx = avctx;
-avctx->width   = width;
-avctx->height  = height;
 avctx->pix_fmt = AV_PIX_FMT_YUV420P;
 for (i = 0; i < 3; i++) {
 ctx->num_vblocks[i] = AV_CEIL_RSHIFT(height,   3 + !!i);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog