[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36961] trunk/blender/source/gameengine/ VideoTexture/VideoFFmpeg.cpp: == FFMPEG ==

[Peter Schlaile]

Revision: 36961
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36961
Author:   schlaile
Date:     2011-05-27 23:46:47 +0000 (Fri, 27 May 2011)
Log Message:
-----------
== 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.

                        

Modified Paths:
--------------
    trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp

Modified: trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp
===================================================================
--- trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp	2011-05-27 23:33:40 UTC (rev 36960)
+++ trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp	2011-05-27 23:46:47 UTC (rev 36961)
@@ -641,7 +641,7 @@
 	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;