aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2013-10-27 10:02:26 +0100
committerAnton Khirnov <anton@khirnov.net>2013-10-31 20:14:15 +0100
commitbabbec086790321d9ec045fc2fa4a9d8f4856c8c (patch)
tree4b3da0000d9284491966eac2b436c65db834ffe3
parentcaeed8deeb0c991ce72f371b619055b6a62aee5e (diff)
downloadffmpeg-babbec086790321d9ec045fc2fa4a9d8f4856c8c.tar.gz
dvdsubdec: stop using deprecated avcodec_set_dimensions
-rw-r--r--libavcodec/dvdsubdec.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c
index 3cc9022b7e..c5e864df0c 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");