Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas

[ardour.git] / gtk2_ardour / transcode_ffmpeg.cc

diff --git a/gtk2_ardour/transcode_ffmpeg.cc b/gtk2_ardour/transcode_ffmpeg.cc
index 854b7def2228c53da3e9c3e0227ac15190803d76..9cbc40564cb4c30070ad9a1700e16d3da1b6042a 100644 (file)
--- a/gtk2_ardour/transcode_ffmpeg.cc
+++ b/gtk2_ardour/transcode_ffmpeg.cc
@@ -17,8 +17,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-#ifdef WITH_VIDEOTIMELINE
-
 #include <stdio.h>
 #include <string.h>
 #include <sstream>
@@ -563,5 +561,3 @@ TranscodeFfmpeg::ffmpegparse_v (std::string d, size_t /* s */)
                Progress(f, m_duration); /* EMIT SIGNAL */
        }
 }
-
-#endif /* WITH_VIDEOTIMELINE */