1. updated to compile on windows with VC9. In particular, made c89 co…

…mpatabile and added a config.w32 for normal windows extension builds. 2. Fixed 2 very significant memory leaks during video decoding. 3. Fixed serious frame decode issue for B frames where random end of video frames would get skipped (at least in current ffmpeg implementations see mpenkov/ffmpeg-tutorial#7 and thanks to sobotka for help).  4.  Tried to fix fps and frame count calcuations though don't know if they work across codecs.

config.w32

@@ -0,0 +1,36 @@
+// $Id$
+// vim:ft=javascript
+
+ARG_WITH("ffmpeg", "ffmpeg support", "no");
+
+if(PHP_FFMPEG != "no")
+{
+	if(
+	CHECK_LIB("avcodec.lib", "ffmpeg", PHP_FFMPEG + "\\lib") 
+	&& CHECK_LIB("avformat.lib", "ffmpeg", PHP_FFMPEG + "\\lib") 
+	&& CHECK_LIB("avutil.lib", "ffmpeg", PHP_FFMPEG + "\\lib")
+	&& CHECK_LIB("swscale.lib", "ffmpeg", PHP_FFMPEG + "\\lib")
+	&& CHECK_HEADER_ADD_INCLUDE("libavcodec\\avcodec.h", "CFLAGS_FFMPEG", PHP_FFMPEG + "\\include"))
+	{
+//	  Will crash in Release mode if you don't have the following compile
+//	  flag
+
+	  ADD_FLAG("LDFLAGS_FFMPEG", "/OPT:NOREF");
+
+	  AC_DEFINE("HAVE_LIBGD20", 1);
+	  AC_DEFINE("HAVE_SWSCALER", 1);
+	  AC_DEFINE("HAVE_FFMPEG_PHP", 1);
+	  AC_DEFINE("COMPILE_DL_FFMPEG", 1);
+	  EXTENSION("ffmpeg", "ffmpeg-php.c ffmpeg_movie.c ffmpeg_frame.c ffmpeg_errorhandler.c ffmpeg_tools.c", true);
+//    
+//    Use the following instead of above to build the extension into php
+//    instead of as ext DLL
+//
+//	  EXTENSION("ffmpeg", "ffmpeg-php.c ffmpeg_movie.c ffmpeg_frame.c ffmpeg_errorhandler.c ffmpeg_tools.c");
+	}
+	else
+	{
+		WARNING("ffmpeg not enabled; libraries and headers not found");
+	}
+}
+

ffmpeg-php.c

@@ -148,6 +148,11 @@ PHP_MSHUTDOWN_FUNCTION(ffmpeg)
    Add an entry for ffmpeg-php support in phpinfo() */
 PHP_MINFO_FUNCTION(ffmpeg)
 {
+    AVCodec *next_codec = NULL;
+    char *m_codec_list = NULL;
+    long m_codec_list_len = 0;
+    long m_codec_len = 0;
+
     php_info_print_table_start();
 //    php_info_print_table_header(2, "ffmpeg-php", "enabled");
     php_info_print_table_row(2, "ffmpeg-php version", FFMPEG_PHP_VERSION);
@@ -169,10 +174,6 @@ PHP_MINFO_FUNCTION(ffmpeg)
 #endif
 
     //phpinfo should show the codec list available to aid developers
-    AVCodec *next_codec = NULL;
-    char *m_codec_list = NULL;
-    long m_codec_list_len = 0;
-    long m_codec_len = 0;
     while((next_codec = av_codec_next(next_codec))) {
       //go through each codec and add to the list
       m_codec_len = (strlen(next_codec->name) + 5);

ffmpeg_frame.c

@@ -201,6 +201,8 @@ int _php_convert_frame(ff_frame_context *ff_frame, int dst_fmt) {
     AVFrame *dst_frame;
     int result = 0;
 
+    TSRMLS_FETCH();
+
     if (!ff_frame->av_frame) {
         return -1;
     }
@@ -430,7 +432,8 @@ FFMPEG_PHP_METHOD(ffmpeg_frame, getPresentationTimestamp)
 
     GET_FRAME_RESOURCE(getThis(), ff_frame);
 
-    RETURN_DOUBLE((double)ff_frame->pts / AV_TIME_BASE);
+    //RETURN_DOUBLE((double)ff_frame->pts / AV_TIME_BASE);
+    RETURN_DOUBLE(ff_frame->pts);
 }
 /* }}} */
 

ffmpeg_frame.h

@@ -65,7 +65,7 @@ typedef struct {
     int height;
     int pixel_format;
     int keyframe;
-    int64_t pts;
+    double pts;
 } ff_frame_context;
 
 ff_frame_context* _php_create_ffmpeg_frame(INTERNAL_FUNCTION_PARAMETERS);