diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2011-06-25 09:50:19 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2011-06-25 09:50:19 +0000 |
| commit | 6a5f84f7bbbe1c7c9a9f4b5b996ff38aadd64bfa (patch) | |
| tree | 8f6ada4268768b748ac759fc188c300a8e38966b /multimedia | |
| parent | 28917d3face9a73a71d2eb4b65087c6d4f1b4439 (diff) | |
| download | ports-6a5f84f7bbbe1c7c9a9f4b5b996ff38aadd64bfa.tar.gz ports-6a5f84f7bbbe1c7c9a9f4b5b996ff38aadd64bfa.zip | |
Update ffmpeg 0.7.1 compatibility patch
Notes
Notes:
svn path=/head/; revision=276361
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/mpeg4ip/files/patch-server_mp4live_video_ffmpeg.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/multimedia/mpeg4ip/files/patch-server_mp4live_video_ffmpeg.cpp b/multimedia/mpeg4ip/files/patch-server_mp4live_video_ffmpeg.cpp index 114e87f57d28..a36b5443c90a 100644 --- a/multimedia/mpeg4ip/files/patch-server_mp4live_video_ffmpeg.cpp +++ b/multimedia/mpeg4ip/files/patch-server_mp4live_video_ffmpeg.cpp @@ -1,5 +1,5 @@ --- server/mp4live/video_ffmpeg.cpp.orig 2007-01-30 22:53:45.000000000 +0100 -+++ server/mp4live/video_ffmpeg.cpp 2011-06-24 22:08:18.167374694 +0200 ++++ server/mp4live/video_ffmpeg.cpp 2011-06-25 11:45:14.444347677 +0200 @@ -121,9 +121,6 @@ m_avctx->bit_rate = Profile()->GetIntegerValue(CFG_VIDEO_BIT_RATE) * 1000; @@ -23,12 +23,14 @@ #else AVRational asp = {Profile()->GetIntegerValue(CFG_VIDEO_MPEG4_PAR_WIDTH), -@@ -225,7 +222,7 @@ +@@ -224,8 +221,10 @@ + } } 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; -+ m_picture->pict_type = FF_P_TYPE; + m_picture->pict_type = 0; ++#endif m_picture->data[0] = (uint8_t *)pY; m_picture->data[1] = (uint8_t *)pU; |