[libav-devel] [PATCH 44/50] tiff: stop using deprecated avcodec_set_dimensions

2013-10-27 Thread Anton Khirnov 
---
 libavcodec/tiff.c |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 735eafe..7fb0e7a 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -296,9 +296,9 @@ static int init_image(TiffContext *s, AVFrame *frame)
 return AVERROR_INVALIDDATA;
 }
 if (s-width != s-avctx-width || s-height != s-avctx-height) {
-if ((ret = av_image_check_size(s-width, s-height, 0, s-avctx))  0)
+ret = ff_set_dimensions(s-avctx, s-width, s-height);
+if (ret  0)
 return ret;
-avcodec_set_dimensions(s-avctx, s-width, s-height);
 }
 if ((ret = ff_get_buffer(s-avctx, frame, 0))  0) {
 av_log(s-avctx, AV_LOG_ERROR, get_buffer() failed\n);
-- 
1.7.10.4

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

Re: [libav-devel] [PATCH 44/50] tiff: stop using deprecated avcodec_set_dimensions

2013-10-27 Thread Justin Ruggles 
On 10/27/2013 06:10 AM, Anton Khirnov wrote:
 ---
  libavcodec/tiff.c |4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
 index 735eafe..7fb0e7a 100644
 --- a/libavcodec/tiff.c
 +++ b/libavcodec/tiff.c
 @@ -296,9 +296,9 @@ static int init_image(TiffContext *s, AVFrame *frame)
  return AVERROR_INVALIDDATA;
  }
  if (s-width != s-avctx-width || s-height != s-avctx-height) {
 -if ((ret = av_image_check_size(s-width, s-height, 0, s-avctx))  
 0)
 +ret = ff_set_dimensions(s-avctx, s-width, s-height);
 +if (ret  0)
  return ret;
 -avcodec_set_dimensions(s-avctx, s-width, s-height);
  }
  if ((ret = ff_get_buffer(s-avctx, frame, 0))  0) {
  av_log(s-avctx, AV_LOG_ERROR, get_buffer() failed\n);

Ok.

-Justin

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel