diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-24 12:18:06 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-24 12:18:06 -0400 |
commit | ee1b49f87e4b8e6406c059f29371892872d3fb85 (patch) | |
tree | 107f163d9f707c97a0b8179a5f2afd9995d616ec /gtk2_ardour/transcode_ffmpeg.cc | |
parent | 8cd71108c1d153f84f25c3b9e5153a110826c130 (diff) | |
parent | 1421a34e52862b614f280c751a12893e4abecf88 (diff) |
fix merge conflicts from master
Diffstat (limited to 'gtk2_ardour/transcode_ffmpeg.cc')
-rw-r--r-- | gtk2_ardour/transcode_ffmpeg.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gtk2_ardour/transcode_ffmpeg.cc b/gtk2_ardour/transcode_ffmpeg.cc index aedd7d25eb..0a7bf64ecd 100644 --- a/gtk2_ardour/transcode_ffmpeg.cc +++ b/gtk2_ardour/transcode_ffmpeg.cc @@ -37,6 +37,7 @@ #endif using namespace PBD; +using namespace VideoUtils; TranscodeFfmpeg::TranscodeFfmpeg (std::string f) : infile(f) |