diff options
| author | Peter Schlaile <peter@schlaile.de> | 2011-05-28 03:46:47 +0400 |
|---|---|---|
| committer | Peter Schlaile <peter@schlaile.de> | 2011-05-28 03:46:47 +0400 |
| commit | ac034e17324e1ea297502094d9f6a337e9f86e3d (patch) | |
| tree | bd0b1ba8de6953131d1ebadfaca48fccff601099 | |
| parent | 42121590f4bfd65f26e8ec705a660f4cc1bd826e (diff) | |
== FFMPEG ==
Revert of "SVN commit: /data/svn/bf-blender [36957]
trunk/blender/source/gameengine/ VideoTexture/VideoFFmpeg.cpp: fix for
ffmpeg linking in BGE ( patch by Jens Verwiebe (jensverwiebe) over IRC)"
Sorry folks, that patch breaks current ffmpeg GIT version.
Good news: it's all handled now automagically by ffmpeg_compat.h in
intern/ffmpeg
so: everything should be fine and dandy for very old and very new versions.
| -rw-r--r-- | source/gameengine/VideoTexture/VideoFFmpeg.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/VideoTexture/VideoFFmpeg.cpp b/source/gameengine/VideoTexture/VideoFFmpeg.cpp index 532467abf77..f8274756c8b 100644 --- a/source/gameengine/VideoTexture/VideoFFmpeg.cpp +++ b/source/gameengine/VideoTexture/VideoFFmpeg.cpp @@ -641,7 +641,7 @@ void VideoFFmpeg::openCam (char * file, short camIdx) if (m_captRate <= 0.f) m_captRate = defFrameRate; sprintf(rateStr, "%f", m_captRate); - av_parse_video_frame_rate(&frameRate, rateStr); + av_parse_video_rate(&frameRate, rateStr); // populate format parameters // need to specify the time base = inverse of rate formatParams.time_base.num = frameRate.den; |