diff options
author | Dale Curtis <dalecurtis@chromium.org> | 2014-05-20 23:03:57 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-21 19:33:21 +0400 |
commit | ef0c466a0fef4657d3f46cc9adea97e76a8e4faa (patch) | |
tree | 2d78b3064ca05f50def3661a32d93afa7c78c79c /libavcodec/utils.c | |
parent | e61055fd8ba3fee2d4f575b655eb65d7edd039bc (diff) |
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@gmx.at>
Diffstat (limited to 'libavcodec/utils.c')
-rw-r--r-- | libavcodec/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 } |