X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fmpjpeg.c;h=c5e5d1e286473dbdbdeed07a0562fedb7d3834ea;hb=bc70684e74a185d7b80c8b80bdedda659cb581b8;hp=80f83c58719d604936b5f3b702a2e037f1149fca;hpb=a024c3ce9a502849013a4aa2c0a6de0c9270261c;p=ffmpeg

diff --git a/libavformat/mpjpeg.c b/libavformat/mpjpeg.c
index 80f83c58719..c5e5d1e2864 100644
--- a/libavformat/mpjpeg.c
+++ b/libavformat/mpjpeg.c
@@ -34,7 +34,6 @@ static int mpjpeg_write_header(AVFormatContext *s)
 {
     MPJPEGContext *mpj = s->priv_data;
     avio_printf(s->pb, "--%s\r\n", mpj->boundary_tag);
-    avio_flush(s->pb);
     return 0;
 }
 
@@ -50,11 +49,6 @@ static int mpjpeg_write_packet(AVFormatContext *s, AVPacket *pkt)
     return 0;
 }
 
-static int mpjpeg_write_trailer(AVFormatContext *s)
-{
-    return 0;
-}
-
 static const AVOption options[] = {
     { "boundary_tag",    "Boundary tag", offsetof(MPJPEGContext, boundary_tag),   AV_OPT_TYPE_STRING, {.str = BOUNDARY_TAG}, .flags = AV_OPT_FLAG_ENCODING_PARAM },
     { NULL },
@@ -67,7 +61,7 @@ static const AVClass mpjpeg_muxer_class = {
     .version    = LIBAVUTIL_VERSION_INT,
 };
 
-AVOutputFormat ff_mpjpeg_muxer = {
+const AVOutputFormat ff_mpjpeg_muxer = {
     .name              = "mpjpeg",
     .long_name         = NULL_IF_CONFIG_SMALL("MIME multipart JPEG"),
     .mime_type         = "multipart/x-mixed-replace;boundary=" BOUNDARY_TAG,
@@ -77,7 +71,6 @@ AVOutputFormat ff_mpjpeg_muxer = {
     .video_codec       = AV_CODEC_ID_MJPEG,
     .write_header      = mpjpeg_write_header,
     .write_packet      = mpjpeg_write_packet,
-    .write_trailer     = mpjpeg_write_trailer,
     .flags             = AVFMT_NOTIMESTAMPS,
     .priv_class        = &mpjpeg_muxer_class,
 };