diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2011-06-27 22:59:39 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2011-06-27 22:59:39 +0000 |
| commit | f789a1eda292b7113863b4efe5f4e0a7eb0477e6 (patch) | |
| tree | fa9a71ff9640d21566bcc5bf558fa0b6d0424053 /net | |
| parent | 19f3afd85c2d9b77d0ab1c9b16d416f3c2e2c68b (diff) | |
| download | ports-f789a1eda292b7113863b4efe5f4e0a7eb0477e6.tar.gz ports-f789a1eda292b7113863b4efe5f4e0a7eb0477e6.zip | |
Notes
Diffstat (limited to 'net')
| -rw-r--r-- | net/opal3/files/patch-plugins-video-MPEG4-ffmpeg-mpeg4.cxx | 7 | ||||
| -rw-r--r-- | net/opal3/files/patch-plugins-video-h.263-1998-h.263-1998.cxx | 10 |
2 files changed, 7 insertions, 10 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 index 4a9e0127f8fa..b7a500489cb2 100644 --- a/net/opal3/files/patch-plugins-video-MPEG4-ffmpeg-mpeg4.cxx +++ b/net/opal3/files/patch-plugins-video-MPEG4-ffmpeg-mpeg4.cxx @@ -1,15 +1,14 @@ --- 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 @@ +@@ -830,10 +830,10 @@ { _avpicture->pict_type = FF_I_TYPE; } -+/* else // No IFrame requested, let avcodec decide what to do { - _avpicture->pict_type = 0; +- _avpicture->pict_type = 0; ++ _avpicture->pict_type = AV_PICTURE_TYPE_NONE; } -+*/ // 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 index e30e46b2ac19..9a75cf7c4962 100644 --- 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 @@ -1,22 +1,20 @@ --- 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 @@ +@@ -688,7 +688,7 @@ _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; ++ _inputFrame->pict_type = (flags && forceIFrame) ? FF_I_TYPE : AV_PICTURE_TYPE_NONE; currentMb = 0; currentBytes = 0; -@@ -885,7 +886,8 @@ +@@ -885,7 +886,7 @@ _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; ++ _inputFrame->pict_type = (flags && forceIFrame) ? FF_I_TYPE : AV_PICTURE_TYPE_NONE; _txH263PFrame->BeginNewFrame(); _txH263PFrame->SetTimestamp(srcRTP.GetTimestamp()); |