Browse code

avformat: Add single jpeg muxer

Needed to fix Ticket4218

Based on patch by: Otávio Ribeiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Caligula useraccount authored on 2015/06/08 10:28:33
Showing 3 changed files
... ...
@@ -400,6 +400,7 @@ OBJS-$(CONFIG_SEGAFILM_DEMUXER)          += segafilm.o
400 400
 OBJS-$(CONFIG_SEGMENT_MUXER)             += segment.o
401 401
 OBJS-$(CONFIG_SHORTEN_DEMUXER)           += rawdec.o
402 402
 OBJS-$(CONFIG_SIFF_DEMUXER)              += siff.o
403
+OBJS-$(CONFIG_SINGLEJPEG_MUXER)          += rawenc.o
403 404
 OBJS-$(CONFIG_SMACKER_DEMUXER)           += smacker.o
404 405
 OBJS-$(CONFIG_SMJPEG_DEMUXER)            += smjpegdec.o smjpeg.o
405 406
 OBJS-$(CONFIG_SMJPEG_MUXER)              += smjpegenc.o smjpeg.o
... ...
@@ -273,6 +273,7 @@ void av_register_all(void)
273 273
     REGISTER_MUXER   (SEGMENT,          stream_segment);
274 274
     REGISTER_DEMUXER (SHORTEN,          shorten);
275 275
     REGISTER_DEMUXER (SIFF,             siff);
276
+    REGISTER_MUXER   (SINGLEJPEG,       singlejpeg);
276 277
     REGISTER_DEMUXER (SLN,              sln);
277 278
     REGISTER_DEMUXER (SMACKER,          smacker);
278 279
     REGISTER_MUXDEMUX(SMJPEG,           smjpeg);
... ...
@@ -250,6 +250,17 @@ AVOutputFormat ff_mjpeg_muxer = {
250 250
     .write_packet      = ff_raw_write_packet,
251 251
     .flags             = AVFMT_NOTIMESTAMPS,
252 252
 };
253
+
254
+AVOutputFormat ff_singlejpeg_muxer = {
255
+    .name              = "singlejpeg",
256
+    .long_name         = NULL_IF_CONFIG_SMALL("JPEG single image"),
257
+    .mime_type         = "image/jpeg",
258
+    .audio_codec       = AV_CODEC_ID_NONE,
259
+    .video_codec       = AV_CODEC_ID_MJPEG,
260
+    .write_packet      = ff_raw_write_packet,
261
+    .flags             = AVFMT_NOTIMESTAMPS,
262
+    .write_header      = force_one_stream,
263
+};
253 264
 #endif
254 265
 
255 266
 #if CONFIG_MLP_MUXER