mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-08 13:22:53 +02:00
move the mjpeg_encoder struct from mpegvideo.c to mjpegenc.c
Originally committed as revision 9059 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
44301eaa55
commit
63ab52b7ec
@ -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},
|
||||
};
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user