From 36ae08ce1c97b8382fe64326b8cb86e0a6491162 Mon Sep 17 00:00:00 2001 From: Frank Barchard Date: Mon, 22 Aug 2016 16:30:36 -0700 Subject: [PATCH] Suppress MJPEG fprintf() runtime warning TBR=harryjin@google.com BUG=libyuv:630 TEST=local build and try bots pass Review URL: https://codereview.chromium.org/2264293002 . --- source/mjpeg_decoder.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/source/mjpeg_decoder.cc b/source/mjpeg_decoder.cc index 50818418a..22025ad04 100644 --- a/source/mjpeg_decoder.cc +++ b/source/mjpeg_decoder.cc @@ -62,6 +62,7 @@ void init_source(jpeg_decompress_struct* cinfo); void skip_input_data(jpeg_decompress_struct* cinfo, long num_bytes); // NOLINT void term_source(jpeg_decompress_struct* cinfo); void ErrorHandler(jpeg_common_struct* cinfo); +void OutputHandler(jpeg_common_struct* cinfo); MJpegDecoder::MJpegDecoder() : has_scanline_padding_(LIBYUV_FALSE), @@ -77,6 +78,7 @@ MJpegDecoder::MJpegDecoder() decompress_struct_->err = jpeg_std_error(&error_mgr_->base); // Override standard exit()-based error handler. error_mgr_->base.error_exit = &ErrorHandler; + error_mgr_->base.output_message = &OutputHandler; #endif decompress_struct_->client_data = NULL; source_mgr_->init_source = &init_source; @@ -456,7 +458,12 @@ void ErrorHandler(j_common_ptr cinfo) { // and causes it to return (for a second time) with value 1. longjmp(mgr->setjmp_buffer, 1); } -#endif + +void OutputHandler(j_common_ptr cinfo) { + // Suppress fprintf warnings. +} + +#endif // HAVE_SETJMP void MJpegDecoder::AllocOutputBuffers(int num_outbufs) { if (num_outbufs != num_outbufs_) {