]> git.sesse.net Git - x264/commitdiff
Update ffms2 support for its latest API break.
authorSteven Walters <kemuri9@gmail.com>
Wed, 10 Nov 2010 12:21:41 +0000 (07:21 -0500)
committerFiona Glaser <fiona@x264.com>
Sun, 14 Nov 2010 07:09:07 +0000 (23:09 -0800)
configure
input/ffms.c

index e6d7a207b4815d9d75f91001e0b1bdc4bd122147..e1196958c89176178ac5559eaf781663b7390aff 100755 (executable)
--- 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
index 8368a6e863ba8ab3577be3997a50a1928f808835..0e54cf1a188e30d84b9774a1feaf499380bc9c53 100644 (file)
@@ -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;