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

[Michael Niedermayer]

On Tue, May 20, 2014 at 12:03:57PM -0700, Dale Curtis wrote:
> 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
>  }

applied

thanks

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The real ebay dictionary, page 2
"100% positive feedback" - "All either got their money back or didnt complain"
"Best seller ever, very honest" - "Seller refunded buyer after failed scam"
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20140521/edc62ccc/attachment.asc>