[Ffmpeg-cvslog] CVS: ffmpeg/libavformat mpjpeg.c,1.5,1.6

[Michael Niedermayer CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavformat
In directory mail:/var2/tmp/cvs-serv19744

Modified Files:
	mpjpeg.c 
Log Message:
remove -f singlejpeg as its identical to -f mjpeg


Index: mpjpeg.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/mpjpeg.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mpjpeg.c	29 May 2004 02:06:31 -0000	1.5
+++ mpjpeg.c	10 Jul 2005 10:28:59 -0000	1.6
@@ -65,44 +65,9 @@
     mpjpeg_write_trailer,
 };
 
-
-/*************************************/
-/* single frame JPEG */
-
-static int single_jpeg_write_header(AVFormatContext *s)
-{
-    return 0;
-}
-
-static int single_jpeg_write_packet(AVFormatContext *s, AVPacket *pkt)
-{
-    put_buffer(&s->pb, pkt->data, pkt->size);
-    put_flush_packet(&s->pb);
-    return 1; /* no more data can be sent */
-}
-
-static int single_jpeg_write_trailer(AVFormatContext *s)
-{
-    return 0;
-}
-
-static AVOutputFormat single_jpeg_format = {
-    "singlejpeg",
-    "single JPEG image",
-    "image/jpeg",
-    NULL, /* note: no extension to favorize jpeg multiple images match */
-    0,
-    CODEC_ID_NONE,
-    CODEC_ID_MJPEG,
-    single_jpeg_write_header,
-    single_jpeg_write_packet,
-    single_jpeg_write_trailer,
-};
-
 int jpeg_init(void)
 {
     av_register_output_format(&mpjpeg_format);
-    av_register_output_format(&single_jpeg_format);
     return 0;
 }
 #endif //CONFIG_ENCODERS