From 71b765c44bde306bf4d5747e9ca1b9eafa841308 Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Loeuillet?= Date: Mon, 10 Jan 2005 22:00:15 +0000 Subject: [PATCH] ext/jpeg/gstjpegdec.c: Make jpegdec quiet on MJPEG decoding Original commit message from CVS: * ext/jpeg/gstjpegdec.c: (gst_jpegdec_my_output_message), (gst_jpegdec_my_emit_message), (gst_jpegdec_init): Make jpegdec quiet on MJPEG decoding * gst/asfdemux/README: Fix mimetypes for MJPEG and H263 --- ChangeLog | 8 ++++++++ ext/jpeg/gstjpegdec.c | 15 +++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/ChangeLog b/ChangeLog index aab4ee2..422c3df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-01-10 Stephane LOEUILLET + + * ext/jpeg/gstjpegdec.c: (gst_jpegdec_my_output_message), + (gst_jpegdec_my_emit_message), (gst_jpegdec_init): + Make jpegdec quiet on MJPEG decoding + * gst/asfdemux/README: + Fix mimetypes for MJPEG and H263 + 2005-01-10 Ronald S. Bultje * ext/theora/theoradec.c: (theora_dec_chain): diff --git a/ext/jpeg/gstjpegdec.c b/ext/jpeg/gstjpegdec.c index 03b9d65..bfc5881 100644 --- a/ext/jpeg/gstjpegdec.c +++ b/ext/jpeg/gstjpegdec.c @@ -158,6 +158,18 @@ gst_jpegdec_term_source (j_decompress_ptr cinfo) GST_DEBUG ("term_source"); } +METHODDEF (void) +gst_jpegdec_my_output_message (j_common_ptr cinfo) +{ + // Do nothing +} + +METHODDEF (void) +gst_jpegdec_my_emit_message (j_common_ptr cinfo, int msg_level) +{ + // Do nothing +} + static void gst_jpegdec_init (GstJpegDec * jpegdec) { @@ -193,6 +205,9 @@ gst_jpegdec_init (GstJpegDec * jpegdec) memset (&jpegdec->cinfo, 0, sizeof (jpegdec->cinfo)); memset (&jpegdec->jerr, 0, sizeof (jpegdec->jerr)); jpegdec->cinfo.err = jpeg_std_error (&jpegdec->jerr); + jpegdec->cinfo.err->output_message = gst_jpegdec_my_output_message; + jpegdec->cinfo.err->emit_message = gst_jpegdec_my_emit_message; + jpeg_create_decompress (&jpegdec->cinfo); jpegdec->jsrc.init_source = gst_jpegdec_init_source; -- 2.7.4