diff options
| author | André Klitzing <aklitzing@gmail.com> | 2019-02-18 19:11:39 +0100 |
|---|---|---|
| committer | Kevin Daudt <kdaudt@alpinelinux.org> | 2019-02-19 11:53:26 +0000 |
| commit | b4387947d21e4fba56b41d59aaffdaf46168adfd (patch) | |
| tree | 1563ec3cf092e41ff4099782ec9e6d977a3cc827 /testing/motion/ffmpeg4.patch | |
| parent | 232c047147f69ee0210fe4d56136eaf151b23fb9 (diff) | |
| download | aports-b4387947d21e4fba56b41d59aaffdaf46168adfd.tar.bz2 aports-b4387947d21e4fba56b41d59aaffdaf46168adfd.tar.xz | |
testing/motion: upgrade to 4.2.2
Diffstat (limited to 'testing/motion/ffmpeg4.patch')
| -rw-r--r-- | testing/motion/ffmpeg4.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/testing/motion/ffmpeg4.patch b/testing/motion/ffmpeg4.patch deleted file mode 100644 index 3ac4c7967b..0000000000 --- a/testing/motion/ffmpeg4.patch +++ /dev/null @@ -1,43 +0,0 @@ -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){ - |