# HG changeset patch # User michael # Date 1120991339 0 # Node ID 9ace3075f33a77a370b66f72934e9b7c77f73eb2 # Parent e446442b0851766302ac641e73871b3f14847ce1 remove -f singlejpeg as its identical to -f mjpeg diff -r e446442b0851 -r 9ace3075f33a mpjpeg.c --- a/mpjpeg.c Sun Jul 10 00:38:46 2005 +0000 +++ b/mpjpeg.c Sun Jul 10 10:28:59 2005 +0000 @@ -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