diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2007-05-18 22:58:01 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2007-05-18 22:58:01 +0000 |
| commit | 63ab52b7ecdbcaf097862da79efa72e678920725 (patch) | |
| tree | 2b15e7c40389cb0a711b04dc5664b5863b1723e1 | |
| parent | 44301eaa5574094a48910f16add23998b43f835a (diff) | |
move the mjpeg_encoder struct from mpegvideo.c to mjpegenc.c
Originally committed as revision 9059 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/mjpegenc.c | 11 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.c | 13 |
2 files changed, 11 insertions, 13 deletions
diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index 8bc2f60246..03f081703d 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -448,3 +448,14 @@ void ff_mjpeg_encode_mb(MpegEncContext *s, DCTELEM block[6][64]) encode_block(s, block[7], 7); } } + +AVCodec mjpeg_encoder = { + "mjpeg", + CODEC_TYPE_VIDEO, + CODEC_ID_MJPEG, + sizeof(MpegEncContext), + MPV_encode_init, + MPV_encode_picture, + MPV_encode_end, + .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUVJ420P, PIX_FMT_YUVJ422P, -1}, +}; diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 2c863bf5cf..28b84e3d57 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -6930,17 +6930,4 @@ AVCodec wmv1_encoder = { .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, }; -#ifdef CONFIG_MJPEG_ENCODER -AVCodec mjpeg_encoder = { - "mjpeg", - CODEC_TYPE_VIDEO, - CODEC_ID_MJPEG, - sizeof(MpegEncContext), - MPV_encode_init, - MPV_encode_picture, - MPV_encode_end, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUVJ420P, PIX_FMT_YUVJ422P, -1}, -}; -#endif - #endif //CONFIG_ENCODERS |