# HG changeset patch # User diego # Date 1249313033 0 # Node ID fef7b43f0d228ce25b3dd3907276039cdf572a46 # Parent c1cfa467937158ddc4a72af1359cee3201cf9d21 Move AVCodec declarations for RV10/20 from mpegvideo_enc.c to rv10.c. It is better to keep the declarations in conditionally compiled places. diff -r c1cfa4679371 -r fef7b43f0d22 mpegvideo_enc.c --- a/mpegvideo_enc.c Mon Aug 03 08:37:02 2009 +0000 +++ b/mpegvideo_enc.c Mon Aug 03 15:23:53 2009 +0000 @@ -3759,30 +3759,6 @@ .long_name= NULL_IF_CONFIG_SMALL("Flash Video (FLV)"), }; -AVCodec rv10_encoder = { - "rv10", - CODEC_TYPE_VIDEO, - CODEC_ID_RV10, - sizeof(MpegEncContext), - MPV_encode_init, - MPV_encode_picture, - MPV_encode_end, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, - .long_name= NULL_IF_CONFIG_SMALL("RealVideo 1.0"), -}; - -AVCodec rv20_encoder = { - "rv20", - CODEC_TYPE_VIDEO, - CODEC_ID_RV20, - sizeof(MpegEncContext), - MPV_encode_init, - MPV_encode_picture, - MPV_encode_end, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, - .long_name= NULL_IF_CONFIG_SMALL("RealVideo 2.0"), -}; - AVCodec mpeg4_encoder = { "mpeg4", CODEC_TYPE_VIDEO, diff -r c1cfa4679371 -r fef7b43f0d22 rv10.c --- a/rv10.c Mon Aug 03 08:37:02 2009 +0000 +++ b/rv10.c Mon Aug 03 15:23:53 2009 +0000 @@ -781,3 +781,26 @@ .pix_fmts= ff_pixfmt_list_420, }; +AVCodec rv10_encoder = { + "rv10", + CODEC_TYPE_VIDEO, + CODEC_ID_RV10, + sizeof(MpegEncContext), + MPV_encode_init, + MPV_encode_picture, + MPV_encode_end, + .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, + .long_name= NULL_IF_CONFIG_SMALL("RealVideo 1.0"), +}; + +AVCodec rv20_encoder = { + "rv20", + CODEC_TYPE_VIDEO, + CODEC_ID_RV20, + sizeof(MpegEncContext), + MPV_encode_init, + MPV_encode_picture, + MPV_encode_end, + .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, + .long_name= NULL_IF_CONFIG_SMALL("RealVideo 2.0"), +};