aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authormm <mm@FreeBSD.org>2011-06-25 17:48:03 +0800
committermm <mm@FreeBSD.org>2011-06-25 17:48:03 +0800
commitd224b80f6781b28761ca5ad6e9d61b26f6648079 (patch)
treedf2ee98622c1eea999e942b2b69425e1f44fb754 /net
parentabd5c7b9c372a50be9013370e32306b8d321dfec (diff)
downloadfreebsd-ports-gnome-d224b80f6781b28761ca5ad6e9d61b26f6648079.tar.gz
freebsd-ports-gnome-d224b80f6781b28761ca5ad6e9d61b26f6648079.tar.zst
freebsd-ports-gnome-d224b80f6781b28761ca5ad6e9d61b26f6648079.zip
Unbreak with new ffmpeg 0.7.1
Diffstat (limited to 'net')
-rw-r--r--net/opal3/files/patch-plugins-video-MPEG4-ffmpeg-mpeg4.cxx15
-rw-r--r--net/opal3/files/patch-plugins-video-h.263-1998-h.263-1998.cxx22
2 files changed, 37 insertions, 0 deletions
diff --git a/net/opal3/files/patch-plugins-video-MPEG4-ffmpeg-mpeg4.cxx b/net/opal3/files/patch-plugins-video-MPEG4-ffmpeg-mpeg4.cxx
new file mode 100644
index 000000000000..4a9e0127f8fa
--- /dev/null
+++ b/net/opal3/files/patch-plugins-video-MPEG4-ffmpeg-mpeg4.cxx
@@ -0,0 +1,15 @@
+--- plugins/video/MPEG4-ffmpeg/mpeg4.cxx.orig 2011-06-25 11:31:14.153034898 +0200
++++ plugins/video/MPEG4-ffmpeg/mpeg4.cxx 2011-06-25 11:32:04.791577475 +0200
+@@ -830,10 +830,12 @@
+ {
+ _avpicture->pict_type = FF_I_TYPE;
+ }
++/*
+ else // No IFrame requested, let avcodec decide what to do
+ {
+ _avpicture->pict_type = 0;
+ }
++*/
+
+ // Encode a frame
+ int total = FFMPEGLibraryInstance.AvcodecEncodeVideo
diff --git a/net/opal3/files/patch-plugins-video-h.263-1998-h.263-1998.cxx b/net/opal3/files/patch-plugins-video-h.263-1998-h.263-1998.cxx
new file mode 100644
index 000000000000..e30e46b2ac19
--- /dev/null
+++ b/net/opal3/files/patch-plugins-video-h.263-1998-h.263-1998.cxx
@@ -0,0 +1,22 @@
+--- plugins/video/H.263-1998/h263-1998.cxx.orig 2009-09-22 02:57:52.000000000 +0200
++++ plugins/video/H.263-1998/h263-1998.cxx 2011-06-25 11:37:56.719449353 +0200
+@@ -688,7 +688,8 @@
+
+ _inputFrame->data[1] = _inputFrame->data[0] + size;
+ _inputFrame->data[2] = _inputFrame->data[1] + (size / 4);
+- _inputFrame->pict_type = (flags && forceIFrame) ? FF_I_TYPE : 0;
++ if (flags && forceIFrame)
++ _inputFrame->pict_type = FF_I_TYPE;
+
+ currentMb = 0;
+ currentBytes = 0;
+@@ -885,7 +886,8 @@
+ _inputFrame->data[0] = _inputFrameBuffer + FF_INPUT_BUFFER_PADDING_SIZE;
+ _inputFrame->data[1] = _inputFrame->data[0] + size;
+ _inputFrame->data[2] = _inputFrame->data[1] + (size / 4);
+- _inputFrame->pict_type = (flags && forceIFrame) ? FF_I_TYPE : 0;
++ if (flags && forceIFrame)
++ _inputFrame->pict_type = FF_I_TYPE;
+
+ _txH263PFrame->BeginNewFrame();
+ _txH263PFrame->SetTimestamp(srcRTP.GetTimestamp());