proresenc: Rename for incoming NIH-syndrom.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/3/merge
Michael Niedermayer 13 years ago
parent 60991ad6ae
commit 8812c97b98
  1. 3
      libavcodec/Makefile
  2. 1
      libavcodec/allcodecs.c
  3. 13
      libavcodec/proresenc_anatoliy.c

@ -331,7 +331,8 @@ OBJS-$(CONFIG_PPM_DECODER) += pnmdec.o pnm.o
OBJS-$(CONFIG_PPM_ENCODER) += pnmenc.o pnm.o OBJS-$(CONFIG_PPM_ENCODER) += pnmenc.o pnm.o
OBJS-$(CONFIG_PRORES_DECODER) += proresdec2.o OBJS-$(CONFIG_PRORES_DECODER) += proresdec2.o
OBJS-$(CONFIG_PRORES_LGPL_DECODER) += proresdec_lgpl.o proresdsp.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_PTX_DECODER) += ptx.o
OBJS-$(CONFIG_QCELP_DECODER) += qcelpdec.o celp_math.o \ OBJS-$(CONFIG_QCELP_DECODER) += qcelpdec.o celp_math.o \
celp_filters.o acelp_vectors.o \ celp_filters.o acelp_vectors.o \

@ -181,6 +181,7 @@ void avcodec_register_all(void)
REGISTER_ENCDEC (PNG, png); REGISTER_ENCDEC (PNG, png);
REGISTER_ENCDEC (PPM, ppm); REGISTER_ENCDEC (PPM, ppm);
REGISTER_ENCDEC (PRORES, prores); REGISTER_ENCDEC (PRORES, prores);
REGISTER_ENCODER (PRORES_ANATOLIY, prores_anatoliy);
REGISTER_DECODER (PRORES_LGPL, prores_lgpl); REGISTER_DECODER (PRORES_LGPL, prores_lgpl);
REGISTER_DECODER (PTX, ptx); REGISTER_DECODER (PTX, ptx);
REGISTER_DECODER (QDRAW, qdraw); REGISTER_DECODER (QDRAW, qdraw);

@ -584,6 +584,19 @@ static av_cold int prores_encode_close(AVCodecContext *avctx)
return 0; 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 = { AVCodec ff_prores_encoder = {
.name = "prores", .name = "prores",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
Loading…
Cancel
Save