Mercurial > libavcodec.hg

changeset 5030:9ce0052d533a libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
move the mjpeg_encoder struct from mpegvideo.c to mjpegenc.c
author aurel
date Fri, 18 May 2007 22:58:01 +0000
parents dbaa06366c3c
children 70f194a2ee53
files mjpegenc.c mpegvideo.c
diffstat 2 files changed, 11 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- 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},
+};
--- 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