Re: [libav-devel] [PATCH 16/50] dvdsubdec: stop using deprecated avcodec_set_dimensions

2013-10-28 Thread Justin Ruggles 

On 10/27/2013 06:10 AM, Anton Khirnov wrote:

---
  libavcodec/dvdsubdec.c |   10 +++---
  1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c
index 3cc9022..c5e864d 100644
--- a/libavcodec/dvdsubdec.c
+++ b/libavcodec/dvdsubdec.c
@@ -21,6 +21,8 @@
  #include avcodec.h
  #include get_bits.h
  #include dsputil.h
+#include internal.h
+
  #include libavutil/attributes.h
  #include libavutil/colorspace.h
  #include libavutil/imgutils.h
@@ -527,9 +529,11 @@ static av_cold int dvdsub_init(AVCodecContext *avctx)
  }
  } else if (!strncmp(size:, cur, 5)) {
  int w, h;
-if (sscanf(cur + 5, %dx%d, w, h) == 2 
-av_image_check_size(w, h, 0, avctx) = 0)
-avcodec_set_dimensions(avctx, w, h);
+if (sscanf(cur + 5, %dx%d, w, h) == 2) {
+   int ret = ff_set_dimensions(avctx, w, h);
+   if (ret  0)
+   return ret;
+}
  }
  cur += strcspn(cur, \n\r);
  cur += strspn(cur, \n\r);


Ok

-Justin

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

[libav-devel] [PATCH 16/50] dvdsubdec: stop using deprecated avcodec_set_dimensions

2013-10-27 Thread Anton Khirnov 
---
 libavcodec/dvdsubdec.c |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c
index 3cc9022..c5e864d 100644
--- a/libavcodec/dvdsubdec.c
+++ b/libavcodec/dvdsubdec.c
@@ -21,6 +21,8 @@
 #include avcodec.h
 #include get_bits.h
 #include dsputil.h
+#include internal.h
+
 #include libavutil/attributes.h
 #include libavutil/colorspace.h
 #include libavutil/imgutils.h
@@ -527,9 +529,11 @@ static av_cold int dvdsub_init(AVCodecContext *avctx)
 }
 } else if (!strncmp(size:, cur, 5)) {
 int w, h;
-if (sscanf(cur + 5, %dx%d, w, h) == 2 
-av_image_check_size(w, h, 0, avctx) = 0)
-avcodec_set_dimensions(avctx, w, h);
+if (sscanf(cur + 5, %dx%d, w, h) == 2) {
+   int ret = ff_set_dimensions(avctx, w, h);
+   if (ret  0)
+   return ret;
+}
 }
 cur += strcspn(cur, \n\r);
 cur += strspn(cur, \n\r);
-- 
1.7.10.4

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