projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changes to waveform clipping display
[ardour.git]
/
gtk2_ardour
/
transcode_ffmpeg.h
diff --git
a/gtk2_ardour/transcode_ffmpeg.h
b/gtk2_ardour/transcode_ffmpeg.h
index b809719f010616d1150f78ccd08ed273e02ff532..d1f445bf487ff109cc04f0318871c27d34d8e61d 100644
(file)
--- a/
gtk2_ardour/transcode_ffmpeg.h
+++ b/
gtk2_ardour/transcode_ffmpeg.h
@@
-17,8
+17,6
@@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#ifdef WITH_VIDEOTIMELINE
-
#ifndef __ardour_transcode_ffmpeg_h__
#define __ardour_transcode_ffmpeg_h__
#ifndef __ardour_transcode_ffmpeg_h__
#define __ardour_transcode_ffmpeg_h__
@@
-27,12
+25,12
@@
#include "system_exec.h"
/* TODO: use a namespace here ? */
#include "system_exec.h"
/* TODO: use a namespace here ? */
-struct AudioStream {
+struct
FF
AudioStream {
std::string name;
std::string stream_id;
uint32_t channels;
};
std::string name;
std::string stream_id;
uint32_t channels;
};
-typedef std::vector<AudioStream> AudioStreams;
+typedef std::vector<
FF
AudioStream> AudioStreams;
typedef std::map<std::string,std::string> FFSettings;
/** @class TranscodeFfmpeg
typedef std::map<std::string,std::string> FFSettings;
/** @class TranscodeFfmpeg
@@
-164,4
+162,3
@@
class TranscodeFfmpeg : public sigc::trackable
};
#endif /* __ardour_transcode_ffmpeg_h__ */
};
#endif /* __ardour_transcode_ffmpeg_h__ */
-#endif /* WITH_VIDEOTIMELINE */