diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-11-01 11:35:34 -0400 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-11-07 16:46:17 +0000 |
| commit | a99473742ac3c4359d57be74da5f8334a3a87fb4 (patch) | |
| tree | 17c381c354118faaf57cb6729091d30fc310ab01 /testing/motion/ffmpeg4.patch | |
| parent | 5870aa911f41349bc815ab697af1753f047a4323 (diff) | |
| download | aports-a99473742ac3c4359d57be74da5f8334a3a87fb4.tar.bz2 aports-a99473742ac3c4359d57be74da5f8334a3a87fb4.tar.xz | |
testing/motion: patch for ffmpeg 4
Diffstat (limited to 'testing/motion/ffmpeg4.patch')
| -rw-r--r-- | testing/motion/ffmpeg4.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/testing/motion/ffmpeg4.patch b/testing/motion/ffmpeg4.patch new file mode 100644 index 0000000000..3ac4c7967b --- /dev/null +++ b/testing/motion/ffmpeg4.patch @@ -0,0 +1,43 @@ +diff --git a/ffmpeg.c b/ffmpeg.c +index 1e6cdf6..4299ba3 100644 +--- a/ffmpeg.c ++++ b/ffmpeg.c +@@ -67,6 +67,19 @@ + + #endif + ++/*********************************************/ ++#if (LIBAVCODEC_VERSION_MAJOR >= 57) ++ ++#define MY_CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER ++#define MY_CODEC_FLAG_QSCALE AV_CODEC_FLAG_QSCALE ++ ++#else ++ ++#define MY_CODEC_FLAG_GLOBAL_HEADER CODEC_FLAG_GLOBAL_HEADER ++#define MY_CODEC_FLAG_QSCALE CODEC_FLAG_QSCALE ++ ++#endif ++ + /*********************************************/ + AVFrame *my_frame_alloc(void){ + AVFrame *pic; +@@ -548,7 +561,7 @@ static int ffmpeg_set_quality(struct ffmpeg *ffmpeg){ + /* The selection of 8000 is a subjective number based upon viewing output files */ + if (ffmpeg->vbr > 0){ + ffmpeg->vbr =(int)(((100-ffmpeg->vbr)*(100-ffmpeg->vbr)*(100-ffmpeg->vbr) * 8000) / 1000000) + 1; +- ffmpeg->ctx_codec->flags |= CODEC_FLAG_QSCALE; ++ ffmpeg->ctx_codec->flags |= MY_CODEC_FLAG_QSCALE; + ffmpeg->ctx_codec->global_quality=ffmpeg->vbr; + } + } +@@ -673,7 +686,7 @@ static int ffmpeg_set_codec(struct ffmpeg *ffmpeg){ + ffmpeg->ctx_codec->strict_std_compliance = -2; + ffmpeg->ctx_codec->level = 3; + } +- ffmpeg->ctx_codec->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ ffmpeg->ctx_codec->flags |= MY_CODEC_FLAG_GLOBAL_HEADER; + + retcd = ffmpeg_set_quality(ffmpeg); + if (retcd < 0){ + |