Re: [Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36934] trunk/blender: == FFMPEG ==
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 27.5.2011 6:44, Ejner Fergo wrote: I get this error in scons on Ubuntu 11.04 64bit and Fedora 13 32bit with revision 36941: Compiling == 'writeffmpeg.c' source/blender/blenkernel/intern/writeffmpeg.c: In function ‘start_ffmpeg_impl’: source/blender/blenkernel/intern/writeffmpeg.c:758:2: error: implicit declaration of function ‘av_dump_format’ scons: *** [/home/san/sub/blender/trunk/build/linux2/source/blender/blenkernel/intern/writeffmpeg.o] Error 1 scons: building terminated because of errors. Similar error on Windows 'av_dump_format' undefined, same file and line. /Nathan - -- Nathan Letwory Letwory Interactive | Studio Lumikuu http://www.letworyinteractive.com | http://www.lumikuu.com -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.10 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQEcBAEBAgAGBQJN31MlAAoJEKtfN7KsE0Tt9h4H/06NRThbd6miIgnfz0ODEQ6j My4595DfQqAAX8g8mCowWX8ifwRY7sOWJXkrWniGhO89ndtshRBXKMGsMrdCEZ6n frlv1jeyWFWIJuoflSedWVs1d/+zSr5snLs5ob2wWi/KNE/I8Zo7wcAZOqXxH33O psBsUJhH45TdYIIRCfCHqsLKTRwEE1d7oU2wC3agvyqeAIueM4x0HIIEB3XA1IIb RW4yDfSU0eAlDkZ9jBL4EkXCaHhNaCX3jpdpnb6y8AFX/UryuZFFFm0cAltS9POI +PKSzMwoI7VSTz9IkDWFQHwDaL/QDc+9LWAJv6nD4LuyMYapMMGnispCiNOBKtY= =OhcO -END PGP SIGNATURE- ___ Bf-committers mailing list Bf-committers@blender.org http://lists.blender.org/mailman/listinfo/bf-committers
Re: [Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36934] trunk/blender: == FFMPEG ==
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 27.5.2011 0:57, Peter Schlaile wrote: Revision: 36934 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36934 Author: schlaile Date: 2011-05-26 21:57:02 + (Thu, 26 May 2011) Log Message: --- == FFMPEG == * removed a lot of old cruft code for ancient ffmpeg versions * made it compile again against latest ffmpeg / libav GIT (also shouldn't break distro ffmpegs, since those API changes have been introduced over a year ago. If it nevertheless breaks, please send me an email) Before you do such moves, it'd be wise to check with not only distros, but also other platforms if it introduces breaks. FOr various reasons windows still uses a version from April 2010, and with this kind of changes it's important to ensure that breakage won't occur until we can verify that we'll be able to continue supporting this for *all* platforms. That said, you're almost off the hook, as Sergey (nazgul) has been working on getting recent stable FFmpeg built for our win32 and win64 platforms. Hopefully he'll be ready to check those in soon. Again, with this kind of extensive changes, please confer with platform maintainers before putting the block like this. /Nathan - -- Nathan Letwory Letwory Interactive | Studio Lumikuu http://www.letworyinteractive.com | http://www.lumikuu.com -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.10 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQEcBAEBAgAGBQJN3tJwAAoJEKtfN7KsE0TtT9cIAJsgsmFMdDLp+185RdzYesBw aezA5eUAQJ4BB4UNyjgbBfZYZZHu/fXssLz47V//skf49sPLcUgZkAIeYpMe7WCa 7DeqHBrlrVhdieXUC8JQT21SFPo6I/R6ZXGYKbHgOJ1S76+Q+TRgY/6CWwQ8r0JH 6CiafxSlkYnq42sDNMDyiBBxHqLYtBMhNolyLYc4nZGo06pLFpqDXVuNWACTBVVi 1G4wRRyKggOSqxtEnqVQ/zqNoP3XwpTKyPo6Dr546+Md4u+nXzVpZn6mfnDt9O9r KgIjNhRFI/00BsGN6D1wJCt9scQpbkOoFTprb+i3OeGGZhraCWxcbVvnB2lMYbc= =i7X7 -END PGP SIGNATURE- ___ Bf-committers mailing list Bf-committers@blender.org http://lists.blender.org/mailman/listinfo/bf-committers
Re: [Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36934] trunk/blender: == FFMPEG ==
Hi, this commit breaks building on opensuse 11.4/64 with scons, system
ffmpeg is 0.62.
http://www.pasteall.org/21955
Cheers, mib.
Am 26.05.2011, 23:57 Uhr, schrieb Peter Schlaile pe...@schlaile.de:
Revision: 36934
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36934
Author: schlaile
Date: 2011-05-26 21:57:02 + (Thu, 26 May 2011)
Log Message:
---
== FFMPEG ==
* removed a lot of old cruft code for ancient ffmpeg versions
* made it compile again against latest ffmpeg / libav GIT
(also shouldn't break distro ffmpegs, since those API changes
have been introduced over a year ago. If it nevertheless breaks,
please send me an email)
Modified Paths:
--
trunk/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
trunk/blender/source/blender/imbuf/intern/anim_movie.c
trunk/blender/source/blender/imbuf/intern/util.c
trunk/blender/source/blender/makesrna/intern/rna_scene.c
trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp
trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.h
Modified: trunk/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
===
---
trunk/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp2011-05-26
21:04:01 UTC (rev 36933)
+++
trunk/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp2011-05-26
21:57:02 UTC (rev 36934)
@@ -52,6 +52,10 @@
int read_length, data_size;
+ AVPacket tmp_pkt;
+
+ av_init_packet(tmp_pkt);
+
// as long as there is still data in the package
while(audio_pkg_size 0)
{
@@ -64,16 +68,15 @@
// read samples from the packet
data_size = buf_size - buf_pos;
- /*read_length = avcodec_decode_audio3(m_codecCtx,
- (int16_t*)(((data_t*)buffer.getBuffer())+buf_pos),
- data_size,
- packet);*/
- read_length = avcodec_decode_audio2(m_codecCtx,
-
(int16_t*)(((data_t*)buffer.getBuffer()) + buf_pos),
- data_size,
- audio_pkg_data,
- audio_pkg_size);
+ tmp_pkt.data = audio_pkg_data;
+ tmp_pkt.size = audio_pkg_size;
+
+ read_length = avcodec_decode_audio3(
+ m_codecCtx,
+ (int16_t*)(((data_t*)buffer.getBuffer()) + buf_pos),
+ data_size, tmp_pkt);
+
// read error, next packet!
if(read_length 0)
break;
@@ -112,7 +115,7 @@
for(unsigned int i = 0; i m_formatCtx-nb_streams; i++)
{
- if((m_formatCtx-streams[i]-codec-codec_type ==
CODEC_TYPE_AUDIO)
+ if((m_formatCtx-streams[i]-codec-codec_type ==
AVMEDIA_TYPE_AUDIO)
(m_stream 0))
{
m_stream=i;
Modified: trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
===
---
trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c 2011-05-26
21:04:01 UTC (rev 36933)
+++
trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c 2011-05-26
21:57:02 UTC (rev 36934)
@@ -39,19 +39,6 @@
#include libswscale/swscale.h
#include libavcodec/opt.h
-#if LIBAVFORMAT_VERSION_INT (49 16)
-#define FFMPEG_OLD_FRAME_RATE 1
-#else
-#define FFMPEG_CODEC_IS_POINTER 1
-#define FFMPEG_CODEC_TIME_BASE 1
-#endif
-
-#if LIBAVFORMAT_VERSION_INT = (52 16)
-#define OUTFILE_PB (outfile-pb)
-#else
-#define OUTFILE_PB (outfile-pb)
-#endif
-
#if defined(WIN32) (!(defined snprintf))
#define snprintf _snprintf
#endif
@@ -114,24 +101,12 @@
}
}
-#ifdef FFMPEG_CODEC_IS_POINTER
-static AVCodecContext* get_codec_from_stream(AVStream* stream)
-{
- return stream-codec;
-}
-#else
-static AVCodecContext* get_codec_from_stream(AVStream* stream)
-{
- return stream-codec;
-}
-#endif
-
static int write_audio_frame(void)
{
AVCodecContext* c = NULL;
AVPacket pkt;
- c = get_codec_from_stream(audio_stream);
+ c = audio_stream-codec;
av_init_packet(pkt);
pkt.size = 0;
@@ -153,17 +128,15 @@
if(c-coded_frame c-coded_frame-pts != AV_NOPTS_VALUE)
{
-#ifdef FFMPEG_CODEC_TIME_BASE
pkt.pts = av_rescale_q(c-coded_frame-pts,
-c-time_base,
audio_stream-time_base);
-#else
- pkt.pts = c-coded_frame-pts;
-#endif
+c-time_base, audio_stream-time_base);
fprintf(stderr, Audio Frame PTS: %d\n,
Re: [Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36934] trunk/blender: == FFMPEG ==
On 11/05/27 7:51, Nathan Letwory wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 27.5.2011 0:57, Peter Schlaile wrote: Revision: 36934 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36934 Author: schlaile Date: 2011-05-26 21:57:02 + (Thu, 26 May 2011) Log Message: --- == FFMPEG == Before you do such moves, it'd be wise to check with not only distros, but also other platforms if it introduces breaks. FOr various reasons windows still uses a version from April 2010, and with this kind of changes it's important to ensure that breakage won't occur until we can verify that we'll be able to continue supporting this for *all* platforms. Again, with this kind of extensive changes, please confer with platform maintainers before putting the block like this. /Nathan Breaks OSX compiles with Darwin9universal current libs. (ffmpeg in Darwin9 is currently dated Nov 21 2010. (built by damien78) According to the README file these are 0.6.1 FFMPEG. Mike. ___ Bf-committers mailing list Bf-committers@blender.org http://lists.blender.org/mailman/listinfo/bf-committers
Re: [Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36934] trunk/blender: == FFMPEG ==
I get this error in scons on Ubuntu 11.04 64bit and Fedora 13 32bit with revision 36941: Compiling == 'writeffmpeg.c' source/blender/blenkernel/intern/writeffmpeg.c: In function ‘start_ffmpeg_impl’: source/blender/blenkernel/intern/writeffmpeg.c:758:2: error: implicit declaration of function ‘av_dump_format’ scons: *** [/home/san/sub/blender/trunk/build/linux2/source/blender/blenkernel/intern/writeffmpeg.o] Error 1 scons: building terminated because of errors. Best regards, Ejner On Fri, May 27, 2011 at 4:06 AM, Mike S blender...@mikes.id.au wrote: On 11/05/27 7:51, Nathan Letwory wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 27.5.2011 0:57, Peter Schlaile wrote: Revision: 36934 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36934 Author: schlaile Date: 2011-05-26 21:57:02 + (Thu, 26 May 2011) Log Message: --- == FFMPEG == Before you do such moves, it'd be wise to check with not only distros, but also other platforms if it introduces breaks. FOr various reasons windows still uses a version from April 2010, and with this kind of changes it's important to ensure that breakage won't occur until we can verify that we'll be able to continue supporting this for *all* platforms. Again, with this kind of extensive changes, please confer with platform maintainers before putting the block like this. /Nathan Breaks OSX compiles with Darwin9universal current libs. (ffmpeg in Darwin9 is currently dated Nov 21 2010. (built by damien78) According to the README file these are 0.6.1 FFMPEG. Mike. ___ Bf-committers mailing list Bf-committers@blender.org http://lists.blender.org/mailman/listinfo/bf-committers ___ Bf-committers mailing list Bf-committers@blender.org http://lists.blender.org/mailman/listinfo/bf-committers
