From 8812c97b98321f82763b7c9c1363c7c1f6cace8f Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 16 Feb 2012 00:37:17 +0100 Subject: [PATCH] proresenc: Rename for incoming NIH-syndrom. Signed-off-by: Michael Niedermayer --- libavcodec/Makefile | 3 ++- libavcodec/allcodecs.c | 1 + libavcodec/{proresenc.c => proresenc_anatoliy.c} | 13 +++++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) rename libavcodec/{proresenc.c => proresenc_anatoliy.c} (97%) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 49664078b3..2701696070 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -331,7 +331,8 @@ OBJS-$(CONFIG_PPM_DECODER) += pnmdec.o pnm.o OBJS-$(CONFIG_PPM_ENCODER) += pnmenc.o pnm.o OBJS-$(CONFIG_PRORES_DECODER) += proresdec2.o OBJS-$(CONFIG_PRORES_LGPL_DECODER) += proresdec_lgpl.o proresdsp.o -OBJS-$(CONFIG_PRORES_ENCODER) += proresenc.o +OBJS-$(CONFIG_PRORES_ENCODER) += proresenc_anatoliy.o +OBJS-$(CONFIG_PRORES_ANATOLIY_ENCODER) += proresenc_anatoliy.o OBJS-$(CONFIG_PTX_DECODER) += ptx.o OBJS-$(CONFIG_QCELP_DECODER) += qcelpdec.o celp_math.o \ celp_filters.o acelp_vectors.o \ diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 54f67691aa..aea38eea85 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -181,6 +181,7 @@ void avcodec_register_all(void) REGISTER_ENCDEC (PNG, png); REGISTER_ENCDEC (PPM, ppm); REGISTER_ENCDEC (PRORES, prores); + REGISTER_ENCODER (PRORES_ANATOLIY, prores_anatoliy); REGISTER_DECODER (PRORES_LGPL, prores_lgpl); REGISTER_DECODER (PTX, ptx); REGISTER_DECODER (QDRAW, qdraw); diff --git a/libavcodec/proresenc.c b/libavcodec/proresenc_anatoliy.c similarity index 97% rename from libavcodec/proresenc.c rename to libavcodec/proresenc_anatoliy.c index 09678a002f..00857dd0b6 100644 --- a/libavcodec/proresenc.c +++ b/libavcodec/proresenc_anatoliy.c @@ -584,6 +584,19 @@ static av_cold int prores_encode_close(AVCodecContext *avctx) return 0; } +AVCodec ff_prores_anatoliy_encoder = { + .name = "prores_anatoliy", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_PRORES, + .priv_data_size = sizeof(ProresContext), + .init = prores_encode_init, + .close = prores_encode_close, + .encode = prores_encode_frame, + .pix_fmts = (const enum PixelFormat[]){PIX_FMT_YUV422P10, PIX_FMT_NONE}, + .long_name = NULL_IF_CONFIG_SMALL("Apple ProRes"), + .profiles = profiles +}; + AVCodec ff_prores_encoder = { .name = "prores", .type = AVMEDIA_TYPE_VIDEO,