[FFmpeg-cvslog] Replace assert with AVERROR when recode_subtitle called w/o ICONV.

Dale Curtis git at videolan.org
Wed May 21 17:40:06 CEST 2014


ffmpeg | branch: master | Dale Curtis <dalecurtis at chromium.org> | Tue May 20 12:03:57 2014 -0700| [ef0c466a0fef4657d3f46cc9adea97e76a8e4faa] | committer: Michael Niedermayer

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 <michaelni at gmx.at>

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

 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
 }
 



More information about the ffmpeg-cvslog mailing list