diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2010-01-07 23:53:49 +0000 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2010-01-07 23:53:49 +0000 |
commit | ca334dd14b957c4af7fcab5e97b6ed675c97caad (patch) | |
tree | dd6bfecae0337a32bf00ca80a08dd33d2a8299f8 /libavcodec/mpegvideo_enc.c | |
parent | 84f0aba18dc8815c5cd408238909e4dc8b60684f (diff) | |
download | ffmpeg-ca334dd14b957c4af7fcab5e97b6ed675c97caad.tar.gz |
Split the mpeg4 encoder and decoder off h263.c
Originally committed as revision 21079 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpegvideo_enc.c')
-rw-r--r-- | libavcodec/mpegvideo_enc.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index f3720281ec..e1df08e137 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -36,6 +36,7 @@ #include "faandct.h" #include "aandcttab.h" #include "flv.h" +#include "mpeg4video.h" #include <limits.h> //#undef NDEBUG @@ -3781,19 +3782,6 @@ AVCodec h263p_encoder = { .long_name= NULL_IF_CONFIG_SMALL("H.263+ / H.263-1998 / H.263 version 2"), }; -AVCodec mpeg4_encoder = { - "mpeg4", - CODEC_TYPE_VIDEO, - CODEC_ID_MPEG4, - sizeof(MpegEncContext), - MPV_encode_init, - MPV_encode_picture, - MPV_encode_end, - .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, - .capabilities= CODEC_CAP_DELAY, - .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2"), -}; - AVCodec msmpeg4v1_encoder = { "msmpeg4v1", CODEC_TYPE_VIDEO, |