Revert "motion: update h264_omx unblacklist patch"

This reverts commit 79c43680095094c098a572b0c2b451911b0a5aea.
This commit is contained in:
Joo Aun Saw 2019-08-19 23:52:00 +10:00
parent cc5891feb2
commit 2c11b23fa7
2 changed files with 13 additions and 19 deletions

View File

@ -1,19 +0,0 @@
commit c20e58b27aaa24b1a800e3cf73de1d3311d8987f
Author: Joo Aun Saw <jasaw@dius.com.au>
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",

View File

@ -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;