[fuse-emulator-cvs] SF.net SVN: fuse-emulator:[4319] branches/fmfx-2010-09-14/fuse-utils/ fmfconv.c

[<fr...@us...>]

Revision: 4319
          http://fuse-emulator.svn.sourceforge.net/fuse-emulator/?rev=4319&view=rev
Author:   fredm
Date:     2011-03-15 12:15:22 +0000 (Tue, 15 Mar 2011)

Log Message:
-----------
Fix the automatic sound output selection when using ffmpeg output (Gergely
Szasz).

Modified Paths:
--------------
    branches/fmfx-2010-09-14/fuse-utils/fmfconv.c

Modified: branches/fmfx-2010-09-14/fuse-utils/fmfconv.c
===================================================================
--- branches/fmfx-2010-09-14/fuse-utils/fmfconv.c	2011-02-23 22:32:22 UTC (rev 4318)
+++ branches/fmfx-2010-09-14/fuse-utils/fmfconv.c	2011-03-15 12:15:22 UTC (rev 4319)
@@ -688,6 +688,9 @@
       printe( "Cannot open sound file '%s'...\n", snd_name );
       return ERR_OPEN_SND;
     }
+  } else if( out_t == TYPE_FFMPEG ) {	/* FFMPEG video and audio if nothing else specified */
+    snd_t = TYPE_FFMPEG;
+    return 0;
   } else {
     snd_t = TYPE_NONE;
     return 0;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.