[FFmpeg-cvslog] r9059 - in trunk/libavcodec: mjpegenc.c mpegvideo.c

[aurel]

Author: aurel
Date: Sat May 19 00:58:01 2007
New Revision: 9059

Log:
move the mjpeg_encoder struct from mpegvideo.c to mjpegenc.c

Modified:
   trunk/libavcodec/mjpegenc.c
   trunk/libavcodec/mpegvideo.c

Modified: trunk/libavcodec/mjpegenc.c
==============================================================================
--- trunk/libavcodec/mjpegenc.c	(original)
+++ trunk/libavcodec/mjpegenc.c	Sat May 19 00:58:01 2007
@@ -448,3 +448,14 @@ void ff_mjpeg_encode_mb(MpegEncContext *
         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},
+};

Modified: trunk/libavcodec/mpegvideo.c
==============================================================================
--- trunk/libavcodec/mpegvideo.c	(original)
+++ trunk/libavcodec/mpegvideo.c	Sat May 19 00:58:01 2007
@@ -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