# HG changeset patch # User aurel # Date 1179529081 0 # Node ID 9ce0052d533a89664457835c02088cc06d0e7149 # Parent dbaa06366c3c6c61d4a87feb676927db0e94915a move the mjpeg_encoder struct from mpegvideo.c to mjpegenc.c diff -r dbaa06366c3c -r 9ce0052d533a mjpegenc.c --- a/mjpegenc.c Fri May 18 22:54:54 2007 +0000 +++ b/mjpegenc.c Fri May 18 22:58:01 2007 +0000 @@ -448,3 +448,14 @@ 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 -r dbaa06366c3c -r 9ce0052d533a mpegvideo.c --- a/mpegvideo.c Fri May 18 22:54:54 2007 +0000 +++ b/mpegvideo.c Fri May 18 22:58:01 2007 +0000 @@ -6930,17 +6930,4 @@ .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