[FFmpeg-cvslog] r21052 - in trunk/libavcodec: flvenc.c mpegvideo_enc.c
michael
subversion
Thu Jan 7 06:41:49 CET 2010
Author: michael
Date: Thu Jan 7 06:41:49 2010
New Revision: 21052
Log:
Move forgotton "AVCodec flv_encoder" over to flvenc.c.
Modified:
trunk/libavcodec/flvenc.c
trunk/libavcodec/mpegvideo_enc.c
Modified: trunk/libavcodec/flvenc.c
==============================================================================
--- trunk/libavcodec/flvenc.c Thu Jan 7 06:36:45 2010 (r21051)
+++ trunk/libavcodec/flvenc.c Thu Jan 7 06:41:49 2010 (r21052)
@@ -82,3 +82,15 @@ void ff_flv2_encode_ac_esc(PutBitContext
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"),
+};
Modified: trunk/libavcodec/mpegvideo_enc.c
==============================================================================
--- trunk/libavcodec/mpegvideo_enc.c Thu Jan 7 06:36:45 2010 (r21051)
+++ trunk/libavcodec/mpegvideo_enc.c Thu Jan 7 06:41:49 2010 (r21052)
@@ -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,
More information about the ffmpeg-cvslog
mailing list