summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2010-01-07 05:41:49 +0000
committerMichael Niedermayer <michaelni@gmx.at>2010-01-07 05:41:49 +0000
commit6a14a15722d864ee8b3c49b47af6909ff504ec7f (patch)
treea3ed41533903e506c224c768b2b5de5bdc774c65
parenta0b0d75368c603671379de73993404955ca96079 (diff)
Move forgotton "AVCodec flv_encoder" over to flvenc.c.
Originally committed as revision 21052 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/flvenc.c12
-rw-r--r--libavcodec/mpegvideo_enc.c12
2 files changed, 12 insertions, 12 deletions
diff --git a/libavcodec/flvenc.c b/libavcodec/flvenc.c
index c8a630b374..f07f993d3d 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 73b27c9b2e..f3720281ec 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,