From ef0c466a0fef4657d3f46cc9adea97e76a8e4faa Mon Sep 17 00:00:00 2001 From: Dale Curtis Date: Tue, 20 May 2014 12:03:57 -0700 Subject: [PATCH] Replace assert with AVERROR when recode_subtitle called w/o ICONV. recode_subtitle() is called implicitly by avformat_find_stream_info(). As such, clients which disable ICONV always crash if a file contains subtitles; even if they don't care about them. Signed-off-by: Michael Niedermayer --- libavcodec/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index b09126cfa9..da61331407 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -2553,7 +2553,7 @@ end: iconv_close(cd); return ret; #else - av_assert0(!"requesting subtitles recoding without iconv"); + return AVERROR(EINVAL); #endif }