[FFmpeg-devel] [PATCH 2/4] Replace assert with AVERROR when recode_subtitle called w/o ICONV.

[Dale Curtis]

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.
---
 libavcodec/utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index b09126c..da61331 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
 }
 
-- 
1.9.1.423.g4596e3a