From 2e3bbd1993d1c3d5e0c917ae88a810cc7894a852 Mon Sep 17 00:00:00 2001 From: michael <michael@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b> Date: Thu, 7 Jan 2010 05:41:49 +0000 Subject: [PATCH] Move forgotton "AVCodec flv_encoder" over to flvenc.c. git-svn-id: file:///var/local/repositories/ffmpeg/trunk@21052 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b --- libavcodec/flvenc.c | 12 ++++++++++++ libavcodec/mpegvideo_enc.c | 12 ------------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libavcodec/flvenc.c b/libavcodec/flvenc.c index c8a630b37..f07f993d3 100644 --- a/libavcodec/flvenc.c +++ b/libavcodec/flvenc.c @@ -82,3 +82,15 @@ void ff_flv2_encode_ac_esc(PutBitContext *pb, int slevel, int level, int run, in put_sbits(pb, 11, slevel); } } + +AVCodec flv_encoder = { + "flv", + CODEC_TYPE_VIDEO, + CODEC_ID_FLV1, + sizeof(MpegEncContext), + MPV_encode_init, + MPV_encode_picture, + MPV_encode_end, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, + .long_name= NULL_IF_CONFIG_SMALL("Flash Video (FLV) / Sorenson Spark / Sorenson H.263"), +}; diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 73b27c9b2..f3720281e 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -3781,18 +3781,6 @@ AVCodec h263p_encoder = { .long_name= NULL_IF_CONFIG_SMALL("H.263+ / H.263-1998 / H.263 version 2"), }; -AVCodec flv_encoder = { - "flv", - CODEC_TYPE_VIDEO, - CODEC_ID_FLV1, - sizeof(MpegEncContext), - MPV_encode_init, - MPV_encode_picture, - MPV_encode_end, - .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, - .long_name= NULL_IF_CONFIG_SMALL("Flash Video (FLV) / Sorenson Spark / Sorenson H.263"), -}; - AVCodec mpeg4_encoder = { "mpeg4", CODEC_TYPE_VIDEO, -- 2.25.4