[FFmpeg-cvslog] lavc/dvdsubenc: only check canvas size when it is actually set

[Anton Khirnov]

ffmpeg | branch: release/6.0 | Anton Khirnov <anton at khirnov.net> | Thu Nov 30 11:21:24 2023 +0100| [133069b4340961a1b3e8562a0dabfc61b35af84c] | committer: Anton Khirnov

lavc/dvdsubenc: only check canvas size when it is actually set

Fixes #10650

(cherry picked from commit 5230257ea18e1d3761ee6b0549d56a3ca817f301)
Signed-off-by: Anton Khirnov <anton at khirnov.net>

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

 libavcodec/dvdsubenc.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/dvdsubenc.c b/libavcodec/dvdsubenc.c
index d272b57675..06c2cf5e5a 100644
--- a/libavcodec/dvdsubenc.c
+++ b/libavcodec/dvdsubenc.c
@@ -376,7 +376,8 @@ static int encode_dvd_subtitles(AVCodecContext *avctx,
     x2 = vrect.x + vrect.w - 1;
     y2 = vrect.y + vrect.h - 1;
 
-    if (x2 > avctx->width || y2 > avctx->height) {
+    if ((avctx->width  > 0 && x2 > avctx->width) ||
+        (avctx->height > 0 && y2 > avctx->height)) {
         av_log(avctx, AV_LOG_ERROR, "canvas_size(%d:%d) is too small(%d:%d) for render\n",
                avctx->width, avctx->height, x2, y2);
         ret = AVERROR(EINVAL);