diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2013-02-28 00:45:51 +0100 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2013-02-28 01:23:24 +0100 |
| commit | 7b2d50f81ec5b04e6cb86e8b579fac9a34029951 (patch) | |
| tree | af5a17e3b4e3f41139f609b2e7db1c6043013f0b /libavcodec | |
| parent | 4a8fc1d83b1b55e1ac533644168018ebeec0c732 (diff) | |
| download | ffmpeg-7b2d50f81ec5b04e6cb86e8b579fac9a34029951.tar.gz | |
build: make iconv build configurable.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/utils.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index bc3f172eff..e364b7e991 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -48,7 +48,7 @@ #include <stdarg.h> #include <limits.h> #include <float.h> -#if HAVE_ICONV +#if CONFIG_ICONV # include <iconv.h> #endif @@ -1116,7 +1116,7 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code if (avctx->sub_charenc_mode == FF_SUB_CHARENC_MODE_AUTOMATIC) avctx->sub_charenc_mode = FF_SUB_CHARENC_MODE_PRE_DECODER; - if (!HAVE_ICONV && avctx->sub_charenc_mode == FF_SUB_CHARENC_MODE_PRE_DECODER) { + if (!CONFIG_ICONV && avctx->sub_charenc_mode == FF_SUB_CHARENC_MODE_PRE_DECODER) { av_log(avctx, AV_LOG_ERROR, "Character encoding subtitles " "conversion needs a libavcodec built with iconv support " "for this codec\n"); @@ -1887,7 +1887,7 @@ int attribute_align_arg avcodec_decode_audio4(AVCodecContext *avctx, static int recode_subtitle(AVCodecContext *avctx, AVPacket *outpkt, const AVPacket *inpkt) { -#if HAVE_ICONV +#if CONFIG_ICONV iconv_t cd = (iconv_t)-1; int ret = 0; char *inb, *outb; @@ -1898,7 +1898,7 @@ static int recode_subtitle(AVCodecContext *avctx, if (avctx->sub_charenc_mode != FF_SUB_CHARENC_MODE_PRE_DECODER) return 0; -#if HAVE_ICONV +#if CONFIG_ICONV cd = iconv_open("UTF-8", avctx->sub_charenc); if (cd == (iconv_t)-1) { av_log(avctx, AV_LOG_ERROR, "Unable to open iconv context " |