diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2005-07-10 10:28:59 +0000 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2005-07-10 10:28:59 +0000 |
commit | c6fa36cf587c63bb8eb4dda0dd5ef0f8a7441af4 (patch) | |
tree | 8ec6742638d5978ff5969e43615c81d8642d466c /libavformat/mpjpeg.c | |
parent | 11bec294416e75e09219ca89635e268c437bcc9d (diff) | |
download | ffmpeg-c6fa36cf587c63bb8eb4dda0dd5ef0f8a7441af4.tar.gz |
remove -f singlejpeg as its identical to -f mjpeg
Originally committed as revision 4428 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/mpjpeg.c')
-rw-r--r-- | libavformat/mpjpeg.c | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/libavformat/mpjpeg.c b/libavformat/mpjpeg.c index da61c0726a..db854bac5d 100644 --- a/libavformat/mpjpeg.c +++ b/libavformat/mpjpeg.c @@ -65,44 +65,9 @@ static AVOutputFormat mpjpeg_format = { 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 |