summarylogtreecommitdiffstats
path: root/ffmpeg-99.0011-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch
diff options
context:
space:
mode:
Diffstat (limited to 'ffmpeg-99.0011-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch')
-rw-r--r--ffmpeg-99.0011-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch48
1 files changed, 0 insertions, 48 deletions
diff --git a/ffmpeg-99.0011-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch b/ffmpeg-99.0011-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch
deleted file mode 100644
index 4cb8dd8fc466..000000000000
--- a/ffmpeg-99.0011-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 84e9a1784bbd3182b68cefa5e5feae8da8b9e184 Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Fri, 5 Jun 2015 22:48:33 +0100
-Subject: [PATCH] mpeg4video: Signal unsupported GMC with more than one warp
- point
-
----
- libavcodec/avcodec.h | 1 +
- libavcodec/mpeg4videodec.c | 4 ++++
- 2 files changed, 5 insertions(+)
-
-diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
-index 8c7c420..e63dc2d 100644
---- a/libavcodec/avcodec.h
-+++ b/libavcodec/avcodec.h
-@@ -2527,6 +2527,7 @@ typedef struct AVCodecContext {
- #define FF_BUG_DC_CLIP 4096
- #define FF_BUG_MS 8192 ///< Work around various bugs in Microsoft's broken decoders.
- #define FF_BUG_TRUNCATED 16384
-+#define FF_BUG_GMC_UNSUPPORTED 32768
-
- /**
- * strictly follow the standard (MPEG4, ...).
-diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
-index 9bf33dd..0b5d3b9 100644
---- a/libavcodec/mpeg4videodec.c
-+++ b/libavcodec/mpeg4videodec.c
-@@ -2179,6 +2179,9 @@ int ff_mpeg4_workaround_bugs(AVCodecContext *avctx)
-
- if (ctx->divx_version >= 0)
- s->workaround_bugs |= FF_BUG_HPEL_CHROMA;
-+
-+ if (ctx->num_sprite_warping_points > 1)
-+ s->workaround_bugs |= FF_BUG_GMC_UNSUPPORTED;
- }
-
- if (s->workaround_bugs & FF_BUG_STD_QPEL) {
-@@ -2203,6 +2206,7 @@ int ff_mpeg4_workaround_bugs(AVCodecContext *avctx)
- s->workaround_bugs, ctx->lavc_build, ctx->xvid_build,
- ctx->divx_version, ctx->divx_build, s->divx_packed ? "p" : "");
-
-+ avctx->workaround_bugs = s->workaround_bugs;
- if (CONFIG_MPEG4_DECODER && ctx->xvid_build >= 0 &&
- s->codec_id == AV_CODEC_ID_MPEG4 &&
- avctx->idct_algo == FF_IDCT_AUTO) {
---
-1.9.1
-