[FFmpeg-cvslog] avcodec/decode: Improve validity check a bit

Andreas Rheinhardt git at videolan.org
Fri Mar 1 02:41:31 EET 2024


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Tue Feb 27 22:05:39 2024 +0100| [80736531da54213a515ff24ca3e929afe214ed0f] | committer: Andreas Rheinhardt

avcodec/decode: Improve validity check a bit

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

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

 libavcodec/decode.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/decode.c b/libavcodec/decode.c
index da6446d879..7c67b18bc4 100644
--- a/libavcodec/decode.c
+++ b/libavcodec/decode.c
@@ -977,8 +977,8 @@ int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub,
     }
     if (!avctx->codec)
         return AVERROR(EINVAL);
-    if (avctx->codec->type != AVMEDIA_TYPE_SUBTITLE) {
-        av_log(avctx, AV_LOG_ERROR, "Invalid media type for subtitles\n");
+    if (ffcodec(avctx->codec)->cb_type != FF_CODEC_CB_TYPE_DECODE_SUB) {
+        av_log(avctx, AV_LOG_ERROR, "Codec not subtitle decoder\n");
         return AVERROR(EINVAL);
     }
 



More information about the ffmpeg-cvslog mailing list