[x264-devel] commit: Update ffms2 support for its latest API break. (Steven Walters )

git at videolan.org git at videolan.org
Sun Nov 14 08:10:00 CET 2010


x264 | branch: master | Steven Walters <kemuri9 at gmail.com> | Wed Nov 10 07:21:41 2010 -0500| [c3c8efa0f4d7fc46b9ee110450bfc1e8d1c5b1b3] | committer: Jason Garrett-Glaser 

Update ffms2 support for its latest API break.

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=c3c8efa0f4d7fc46b9ee110450bfc1e8d1c5b1b3
---

 configure    |    2 +-
 input/ffms.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index e6d7a20..e119695 100755
--- a/configure
+++ b/configure
@@ -601,7 +601,7 @@ if [ "$lavf" = "auto" ] ; then
 fi
 
 if [ "$ffms" = "auto" ] ; then
-    ffms_major="2"; ffms_minor="13"; ffms_micro="1"; ffms_bump="0"
+    ffms_major="2"; ffms_minor="14"; ffms_micro="0"; ffms_bump="0"
     ffms="no"
 
     if ${cross_prefix}pkg-config --exists ffms2 2>$DEVNULL; then
diff --git a/input/ffms.c b/input/ffms.c
index 8368a6e..0e54cf1 100644
--- a/input/ffms.c
+++ b/input/ffms.c
@@ -64,7 +64,7 @@ static int open_file( char *psz_filename, hnd_t *p_handle, video_info_t *info, c
     ffms_hnd_t *h = calloc( 1, sizeof(ffms_hnd_t) );
     if( !h )
         return -1;
-    FFMS_Init( 0 );
+    FFMS_Init( 0, 0 );
     FFMS_ErrorInfo e;
     e.BufferSize = 0;
     int seekmode = opt->seek ? FFMS_SEEK_NORMAL : FFMS_SEEK_LINEAR_NO_RW;



More information about the x264-devel mailing list