ffmpeg | branch: master | Caligula useraccount <calig...@sarijopen.student.utwente.nl> | Mon Jun 8 03:28:33 2015 +0200| [51ac1f616f5863c7bd32e04496339b7c2d27880f] | committer: Michael Niedermayer
avformat: Add single jpeg muxer Needed to fix Ticket4218 Based on patch by: Otávio Ribeiro Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=51ac1f616f5863c7bd32e04496339b7c2d27880f --- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/rawenc.c | 11 +++++++++++ 3 files changed, 13 insertions(+) diff --git a/libavformat/Makefile b/libavformat/Makefile index 83196cf..b9169d9 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -400,6 +400,7 @@ OBJS-$(CONFIG_SEGAFILM_DEMUXER) += segafilm.o OBJS-$(CONFIG_SEGMENT_MUXER) += segment.o OBJS-$(CONFIG_SHORTEN_DEMUXER) += rawdec.o OBJS-$(CONFIG_SIFF_DEMUXER) += siff.o +OBJS-$(CONFIG_SINGLEJPEG_MUXER) += rawenc.o OBJS-$(CONFIG_SMACKER_DEMUXER) += smacker.o OBJS-$(CONFIG_SMJPEG_DEMUXER) += smjpegdec.o smjpeg.o OBJS-$(CONFIG_SMJPEG_MUXER) += smjpegenc.o smjpeg.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index af6b927..3a49650 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -273,6 +273,7 @@ void av_register_all(void) REGISTER_MUXER (SEGMENT, stream_segment); REGISTER_DEMUXER (SHORTEN, shorten); REGISTER_DEMUXER (SIFF, siff); + REGISTER_MUXER (SINGLEJPEG, singlejpeg); REGISTER_DEMUXER (SLN, sln); REGISTER_DEMUXER (SMACKER, smacker); REGISTER_MUXDEMUX(SMJPEG, smjpeg); diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c index 9b77cdc..e95cb61 100644 --- a/libavformat/rawenc.c +++ b/libavformat/rawenc.c @@ -250,6 +250,17 @@ AVOutputFormat ff_mjpeg_muxer = { .write_packet = ff_raw_write_packet, .flags = AVFMT_NOTIMESTAMPS, }; + +AVOutputFormat ff_singlejpeg_muxer = { + .name = "singlejpeg", + .long_name = NULL_IF_CONFIG_SMALL("JPEG single image"), + .mime_type = "image/jpeg", + .audio_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_MJPEG, + .write_packet = ff_raw_write_packet, + .flags = AVFMT_NOTIMESTAMPS, + .write_header = force_one_stream, +}; #endif #if CONFIG_MLP_MUXER _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog