From f7813a5324be39d13ab536c245d15dfc602a7849 Mon Sep 17 00:00:00 2001 From: Tim Redfern Date: Sun, 29 Dec 2013 12:19:38 +0000 Subject: basic type mechanism working --- ffmpeg/libavcodec/r210enc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ffmpeg/libavcodec/r210enc.c') diff --git a/ffmpeg/libavcodec/r210enc.c b/ffmpeg/libavcodec/r210enc.c index e19a27e..d61cd75 100644 --- a/ffmpeg/libavcodec/r210enc.c +++ b/ffmpeg/libavcodec/r210enc.c @@ -26,7 +26,7 @@ static av_cold int encode_init(AVCodecContext *avctx) { - avctx->coded_frame = avcodec_alloc_frame(); + avctx->coded_frame = av_frame_alloc(); if (!avctx->coded_frame) return AVERROR(ENOMEM); @@ -88,36 +88,36 @@ static av_cold int encode_close(AVCodecContext *avctx) #if CONFIG_R210_ENCODER AVCodec ff_r210_encoder = { .name = "r210", + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed RGB 10-bit"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_R210, .init = encode_init, .encode2 = encode_frame, .close = encode_close, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_RGB48, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("Uncompressed RGB 10-bit"), }; #endif #if CONFIG_R10K_ENCODER AVCodec ff_r10k_encoder = { .name = "r10k", + .long_name = NULL_IF_CONFIG_SMALL("AJA Kona 10-bit RGB Codec"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_R10K, .init = encode_init, .encode2 = encode_frame, .close = encode_close, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_RGB48, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("AJA Kona 10-bit RGB Codec"), }; #endif #if CONFIG_AVRP_ENCODER AVCodec ff_avrp_encoder = { .name = "avrp", + .long_name = NULL_IF_CONFIG_SMALL("Avid 1:1 10-bit RGB Packer"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_AVRP, .init = encode_init, .encode2 = encode_frame, .close = encode_close, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_RGB48, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("Avid 1:1 10-bit RGB Packer"), }; #endif -- cgit v1.2.3