Re: [libav-devel] [PATCH 49/50] vp8: stop using deprecated avcodec_set_dimensions

[Justin Ruggles]

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

---
  libavcodec/vp5.c |    1 +
  libavcodec/vp6.c |    1 +
  libavcodec/vp8.c |    9 ++++-----
  3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/libavcodec/vp5.c b/libavcodec/vp5.c
index 5cab9b6..b609282 100644
--- a/libavcodec/vp5.c
+++ b/libavcodec/vp5.c
@@ -28,6 +28,7 @@

#include "avcodec.h"

  #include "get_bits.h"
+#include "internal.h"

#include "vp56.h"

  #include "vp56data.h"

Was this part supposed to be with patch 48/50?

diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c
index 07560d0..d10a640 100644
--- a/libavcodec/vp6.c
+++ b/libavcodec/vp6.c
@@ -32,6 +32,7 @@
  #include "avcodec.h"
  #include "get_bits.h"
  #include "huffman.h"
+#include "internal.h"

#include "vp56.h"

  #include "vp56data.h"
diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c
index 910ec20..b1b4f2d 100644
--- a/libavcodec/vp8.c
+++ b/libavcodec/vp8.c
@@ -114,16 +114,15 @@ static void vp8_decode_flush(AVCodecContext *avctx)
  static int update_dimensions(VP8Context *s, int width, int height)
  {
      AVCodecContext *avctx = s->avctx;
-    int i;
+    int i, ret;

if (width != s->avctx->width ||

          height != s->avctx->height) {
-        if (av_image_check_size(width, height, 0, s->avctx))
-            return AVERROR_INVALIDDATA;
-
          vp8_decode_flush_impl(s->avctx, 1);

- avcodec_set_dimensions(s->avctx, width, height);

+        ret = ff_set_dimensions(s->avctx, width, height);
+        if (ret < 0)
+            return ret;
      }

s->mb_width = (s->avctx->coded_width +15) / 16;

Ok

-Justin

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