dont write LAVF_ID if bitexact and any meta tag is set

[ffmpeg] / libavformat / mpjpeg.c

diff --git a/libavformat/mpjpeg.c b/libavformat/mpjpeg.c
index 62e2601aadaaaddfd874c6201cc7f264638bff79..b1621cfa5bcc882af0a7a253c185039acc5cd246 100644 (file)
--- a/libavformat/mpjpeg.c
+++ b/libavformat/mpjpeg.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "avformat.h"
 
@@ -22,6 +22,7 @@
 
 #define BOUNDARY_TAG "ffserver"
 
+#ifdef CONFIG_MUXERS
 static int mpjpeg_write_header(AVFormatContext *s)
 {
     uint8_t buf1[256];
@@ -32,14 +33,13 @@ static int mpjpeg_write_header(AVFormatContext *s)
     return 0;
 }
 
-static int mpjpeg_write_packet(AVFormatContext *s, int stream_index, 
-                               uint8_t *buf, int size, int force_pts)
+static int mpjpeg_write_packet(AVFormatContext *s, AVPacket *pkt)
 {
     uint8_t buf1[256];
 
     snprintf(buf1, sizeof(buf1), "Content-type: image/jpeg\n\n");
     put_buffer(&s->pb, buf1, strlen(buf1));
-    put_buffer(&s->pb, buf, size);
+    put_buffer(&s->pb, pkt->data, pkt->size);
 
     snprintf(buf1, sizeof(buf1), "\n--%s\n", BOUNDARY_TAG);
     put_buffer(&s->pb, buf1, strlen(buf1));
@@ -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, int stream_index,
-                            uint8_t *buf, int size, int force_pts)
-{
-    put_buffer(&s->pb, buf, 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_MUXERS