From 2c11b23fa7362dfc1382f20edb2aa33861c9b390 Mon Sep 17 00:00:00 2001 From: Joo Aun Saw Date: Mon, 19 Aug 2019 23:52:00 +1000 Subject: [PATCH] Revert "motion: update h264_omx unblacklist patch" This reverts commit 79c43680095094c098a572b0c2b451911b0a5aea. --- .../9900-unblacklist-h264-omx-encoder.patch | 19 ------------------- package/motion/enable-h264-omx-codec.patch | 13 +++++++++++++ 2 files changed, 13 insertions(+), 19 deletions(-) delete mode 100644 package/motion/9900-unblacklist-h264-omx-encoder.patch create mode 100644 package/motion/enable-h264-omx-codec.patch diff --git a/package/motion/9900-unblacklist-h264-omx-encoder.patch b/package/motion/9900-unblacklist-h264-omx-encoder.patch deleted file mode 100644 index 38018ba37f..0000000000 --- a/package/motion/9900-unblacklist-h264-omx-encoder.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit c20e58b27aaa24b1a800e3cf73de1d3311d8987f -Author: Joo Aun Saw -Date: Mon Aug 19 16:38:59 2019 +1000 - - enable h264_omx encoder - -diff --git a/ffmpeg.c b/ffmpeg.c -index a3a8701..b9b58de 100644 ---- a/ffmpeg.c -+++ b/ffmpeg.c -@@ -597,7 +597,7 @@ static int ffmpeg_codec_is_blacklisted(const char *codec_name){ - * - remove the "h264_omx" from this blacklist. - * More information: https://github.com/Motion-Project/motion/issues/433 - */ -- "h264_omx", -+ //"h264_omx", - #if (LIBAVCODEC_VERSION_MAJOR < 57) - /* h264_v4l2m2m does not exist on old versions of ffmpeg. */ - "h264_v4l2m2m", diff --git a/package/motion/enable-h264-omx-codec.patch b/package/motion/enable-h264-omx-codec.patch new file mode 100644 index 0000000000..90568ad640 --- /dev/null +++ b/package/motion/enable-h264-omx-codec.patch @@ -0,0 +1,13 @@ +diff --git a/ffmpeg.c b/ffmpeg.c +index a729cda..798c017 100644 +--- a/ffmpeg.c ++++ b/ffmpeg.c +@@ -513,7 +513,7 @@ static int ffmpeg_codec_is_blacklisted(const char *codec_name){ + * - remove the "h264_omx" from this blacklist. + * More information: https://github.com/Motion-Project/motion/issues/433 + */ +- "h264_omx", ++ //"h264_omx", + }; + size_t i; +