From 4036b7708fa7de996b0585a7bc432397c77d41b2 Mon Sep 17 00:00:00 2001 From: philippegorley <gorley.philippe@gmail.com> Date: Mon, 17 Dec 2018 15:35:08 -0500 Subject: [PATCH] contrib/ffmpeg: disable annoying log Change-Id: I38783547dc48b2d7c8edbda2db36ee536df2d37c --- contrib/src/ffmpeg/remove-mjpeg-log.patch | 26 +++++++++++++++++++++++ contrib/src/ffmpeg/rules.mak | 1 + 2 files changed, 27 insertions(+) create mode 100644 contrib/src/ffmpeg/remove-mjpeg-log.patch diff --git a/contrib/src/ffmpeg/remove-mjpeg-log.patch b/contrib/src/ffmpeg/remove-mjpeg-log.patch new file mode 100644 index 0000000000..595baea9c9 --- /dev/null +++ b/contrib/src/ffmpeg/remove-mjpeg-log.patch @@ -0,0 +1,26 @@ +From c557a6211f5a29d89fc2ab561e0fb3d8878fb6ad Mon Sep 17 00:00:00 2001 +From: philippegorley <gorley.philippe@gmail.com> +Date: Mon, 17 Dec 2018 15:27:57 -0500 +Subject: [PATCH] remove mjpeg log + +--- + libavcodec/mjpegdec.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c +index d1dca84d36..4a26c23cd4 100644 +--- a/libavcodec/mjpegdec.c ++++ b/libavcodec/mjpegdec.c +@@ -2294,9 +2294,7 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, + "restart marker: %d\n", start_code & 0x0f); + /* APP fields */ + } else if (start_code >= APP0 && start_code <= APP15) { +- if ((ret = mjpeg_decode_app(s)) < 0) +- av_log(avctx, AV_LOG_ERROR, "unable to decode APP fields: %s\n", +- av_err2str(ret)); ++ ret = mjpeg_decode_app(s); + /* Comment */ + } else if (start_code == COM) { + ret = mjpeg_decode_com(s); +-- +2.17.1 diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak index 29ad7a3d81..dd18fc40f2 100644 --- a/contrib/src/ffmpeg/rules.mak +++ b/contrib/src/ffmpeg/rules.mak @@ -254,6 +254,7 @@ ffmpeg: ffmpeg-$(FFMPEG_HASH).tar.gz rm -Rf $@ $@-$(FFMPEG_HASH) mkdir -p $@-$(FFMPEG_HASH) (cd $@-$(FFMPEG_HASH) && tar x $(if ${BATCH_MODE},,-v) --strip-components=1 -f ../$<) + $(APPLY) $(SRC)/ffmpeg/remove-mjpeg-log.patch $(UPDATE_AUTOCONFIG) $(MOVE) -- GitLab