mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-19 00:13:33 +00:00
Code Issues Releases Activity

Fix C++ build with new ffmpeg (0.7.1)

Browse Source
This commit is contained in:
Martin Matuska 2011-06-27 22:59:39 +00:00
parent 19f3afd85c
commit f789a1eda2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=276530
6 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
multimedia/dvdstyler/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= dvdstyler
DISTVERSION= 1.8.3
PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= multimedia
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}

11
multimedia/dvdstyler/files/patch-src-mediatrc_ffmpeg.cpp Normal file
View File

@ -0,0 +1,11 @@
--- src/mediatrc_ffmpeg.cpp.orig 2011-06-27 23:31:11.388593646 +0200
+++ src/mediatrc_ffmpeg.cpp 2011-06-28 00:27:55.361966692 +0200
@@ -2567,7 +2567,7 @@
} else
big_picture.quality = (int) ost->st->quality;
if (!me_threshold)
- big_picture.pict_type = 0;
+ big_picture.pict_type = AV_PICTURE_TYPE_NONE;
// big_picture.pts = AV_NOPTS_VALUE;
big_picture.pts= ost->sync_opts;
// big_picture.pts= av_rescale(ost->sync_opts, AV_TIME_BASE*(int64_t)enc->time_base.num, enc->time_base.den);

2
multimedia/mpeg4ip/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= mpeg4ip
PORTVERSION= 1.6.1
PORTREVISION= 17
PORTREVISION= 18
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= LOCAL/ahze
# http://sourceforge.net/forum/forum.php?thread_id=1839453&forum_id=59136

7
multimedia/mpeg4ip/files/patch-server_mp4live_video_ffmpeg.cpp
View File

@ -23,14 +23,13 @@
#else
AVRational asp =
{Profile()->GetIntegerValue(CFG_VIDEO_MPEG4_PAR_WIDTH),
@@ -224,8 +221,10 @@
@@ -224,8 +221,8 @@
}
}
if (wantKeyFrame) m_picture->pict_type = FF_I_TYPE; //m_picture->key_frame = 1;
+#if 0
else //m_picture->key_frame = 0;
m_picture->pict_type = 0;
+#endif
- m_picture->pict_type = 0;
+ m_picture->pict_type = AV_PICTURE_TYPE_NONE;
m_picture->data[0] = (uint8_t *)pY;
m_picture->data[1] = (uint8_t *)pU;

7
net/opal3/files/patch-plugins-video-MPEG4-ffmpeg-mpeg4.cxx
View File

@ -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

10
net/opal3/files/patch-plugins-video-h.263-1998-h.263-1998.cxx
View File

@ -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());