jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 14:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

motion: unblacklist h264_v4l2m2m

Browse Source
This commit is contained in:
Joo Aun Saw 2019-08-19 23:55:20 +10:00
parent 2c11b23fa7
commit 223f55aa98
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
package/motion/0002-enable-h264-v4l2m2m.patch
View File

@ -19,17 +19,6 @@ index 3f731ca..beb87b1 100644
// H264 OMX encoder quality can only be controlled via bit_rate // H264 OMX encoder quality can only be controlled via bit_rate
// bit_rate = ffmpeg->width * ffmpeg->height * ffmpeg->fps * quality_factor // bit_rate = ffmpeg->width * ffmpeg->height * ffmpeg->fps * quality_factor
ffmpeg->quality = (int)(((int64_t)ffmpeg->width * ffmpeg->height * ffmpeg->fps * ffmpeg->quality) >> 7); ffmpeg->quality = (int)(((int64_t)ffmpeg->width * ffmpeg->height * ffmpeg->fps * ffmpeg->quality) >> 7);
@@ -596,6 +598,10 @@ static int ffmpeg_codec_is_blacklisted(const char *codec_name){
* More information: https://github.com/Motion-Project/motion/issues/433
*/
"h264_omx",
+#if (LIBAVCODEC_VERSION_MAJOR < 57)
+ /* h264_v4l2m2m does not exist on old versions of ffmpeg. */
+ "h264_v4l2m2m",
+#endif
};
size_t i;
@@ -702,7 +708,10 @@ static int ffmpeg_set_codec(struct ffmpeg *ffmpeg){ @@ -702,7 +708,10 @@ static int ffmpeg_set_codec(struct ffmpeg *ffmpeg){
ffmpeg->ctx_codec->height = ffmpeg->height; ffmpeg->ctx_codec->height = ffmpeg->height;
ffmpeg->ctx_codec->time_base.num = 1; ffmpeg->ctx_codec->time_base.num = 1;