# HG changeset patch # User michael # Date 1262842909 0 # Node ID edaaa3fa540cc1fba7c537cc782d942cfc5a97c4 # Parent 0c8f9288b5e4ed2c6d43e0cfd7d64e3204db2e51 Move forgotton "AVCodec flv_encoder" over to flvenc.c. diff -r 0c8f9288b5e4 -r edaaa3fa540c flvenc.c --- a/flvenc.c Thu Jan 07 05:36:45 2010 +0000 +++ b/flvenc.c Thu Jan 07 05:41:49 2010 +0000 @@ -82,3 +82,15 @@ 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 -r 0c8f9288b5e4 -r edaaa3fa540c mpegvideo_enc.c --- a/mpegvideo_enc.c Thu Jan 07 05:36:45 2010 +0000 +++ b/mpegvideo_enc.c Thu Jan 07 05:41:49 2010 +0000 @@ -3781,18 +3781,6 @@ .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,