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/opal3/files/patch-plugins-video-h.263-1998-h.263-1998.cxx | |
| parent | Add patch to fix building C++ programs (diff) | |
Fix C++ build with new ffmpeg (0.7.1)
Notes
Notes:
svn path=/head/; revision=276530
Diffstat (limited to 'net/opal3/files/patch-plugins-video-h.263-1998-h.263-1998.cxx')
| -rw-r--r-- | net/opal3/files/patch-plugins-video-h.263-1998-h.263-1998.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
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()); |