diff options
Diffstat (limited to 'chromium/third_party/ffmpeg/libavcodec/a64multienc.c')
| -rw-r--r-- | chromium/third_party/ffmpeg/libavcodec/a64multienc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chromium/third_party/ffmpeg/libavcodec/a64multienc.c b/chromium/third_party/ffmpeg/libavcodec/a64multienc.c index 6dd5c2c2ad5..306777418d9 100644 --- a/chromium/third_party/ffmpeg/libavcodec/a64multienc.c +++ b/chromium/third_party/ffmpeg/libavcodec/a64multienc.c @@ -195,7 +195,7 @@ static av_cold int a64multi_close_encoder(AVCodecContext *avctx) return 0; } -static av_cold int a64multi_init_encoder(AVCodecContext *avctx) +static av_cold int a64multi_encode_init(AVCodecContext *avctx) { A64Context *c = avctx->priv_data; int a; @@ -220,9 +220,9 @@ static av_cold int a64multi_init_encoder(AVCodecContext *avctx) a64_palette[mc_colors[a]][2] * 0.11; } - if (!(c->mc_meta_charset = av_malloc(32000 * c->mc_lifetime * sizeof(int))) || + if (!(c->mc_meta_charset = av_malloc_array(c->mc_lifetime, 32000 * sizeof(int))) || !(c->mc_best_cb = av_malloc(CHARSET_CHARS * 32 * sizeof(int))) || - !(c->mc_charmap = av_mallocz(1000 * c->mc_lifetime * sizeof(int))) || + !(c->mc_charmap = av_mallocz_array(c->mc_lifetime, 1000 * sizeof(int))) || !(c->mc_colram = av_mallocz(CHARSET_CHARS * sizeof(uint8_t))) || !(c->mc_charset = av_malloc(0x800 * (INTERLACED+1) * sizeof(uint8_t)))) { av_log(avctx, AV_LOG_ERROR, "Failed to allocate buffer memory.\n"); @@ -402,7 +402,7 @@ AVCodec ff_a64multi_encoder = { .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_A64_MULTI, .priv_data_size = sizeof(A64Context), - .init = a64multi_init_encoder, + .init = a64multi_encode_init, .encode2 = a64multi_encode_frame, .close = a64multi_close_encoder, .pix_fmts = (const enum AVPixelFormat[]) {AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE}, @@ -416,7 +416,7 @@ AVCodec ff_a64multi5_encoder = { .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_A64_MULTI5, .priv_data_size = sizeof(A64Context), - .init = a64multi_init_encoder, + .init = a64multi_encode_init, .encode2 = a64multi_encode_frame, .close = a64multi_close_encoder, .pix_fmts = (const enum AVPixelFormat[]) {AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE}, |