[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56058] trunk/blender/intern/ffmpeg/ ffmpeg_compat.h: Fix compilation with current FFmpeg trunk

Sergey Sharybin sergey.vfx at gmail.com
Mon Apr 15 13:08:07 CEST 2013


Revision: 56058
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56058
Author:   nazgul
Date:     2013-04-15 11:08:02 +0000 (Mon, 15 Apr 2013)
Log Message:
-----------
Fix compilation with current FFmpeg trunk

AVCODEC_MAX_AUDIO_FRAME_SIZE was deprecated and
finally removed from current trunk.

Initial patch by Lawrence D'Oliveiro (ldo) with
own modification, Thanks!

Modified Paths:
--------------
    trunk/blender/intern/ffmpeg/ffmpeg_compat.h

Modified: trunk/blender/intern/ffmpeg/ffmpeg_compat.h
===================================================================
--- trunk/blender/intern/ffmpeg/ffmpeg_compat.h	2013-04-15 10:02:33 UTC (rev 56057)
+++ trunk/blender/intern/ffmpeg/ffmpeg_compat.h	2013-04-15 11:08:02 UTC (rev 56058)
@@ -298,4 +298,9 @@
 	return pts;
 }
 
+/* obsolete constant formerly defined in FFMpeg libavcodec/avcodec.h */
+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
+# define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
 #endif
+
+#endif




More information about the Bf-blender-cvs mailing list