projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Handle multiple audio streams in a single piece of content
[dcpomatic.git]
/
src
/
lib
/
ffmpeg.h
diff --git
a/src/lib/ffmpeg.h
b/src/lib/ffmpeg.h
index 760918437d403dd0624984e31a07fb0bdddff583..835136c759d8b6004f7b9a6f6c7eecf414eac2ba 100644
(file)
--- a/
src/lib/ffmpeg.h
+++ b/
src/lib/ffmpeg.h
@@
-20,13
+20,13
@@
#ifndef DCPOMATIC_FFMPEG_H
#define DCPOMATIC_FFMPEG_H
#ifndef DCPOMATIC_FFMPEG_H
#define DCPOMATIC_FFMPEG_H
-#include <vector>
-#include <boost/shared_ptr.hpp>
-#include <boost/thread/mutex.hpp>
extern "C" {
#include <libavcodec/avcodec.h>
}
#include "file_group.h"
extern "C" {
#include <libavcodec/avcodec.h>
}
#include "file_group.h"
+#include <boost/shared_ptr.hpp>
+#include <boost/thread/mutex.hpp>
+#include <vector>
struct AVFilterGraph;
struct AVCodecContext;
struct AVFilterGraph;
struct AVCodecContext;
@@
-55,7
+55,7
@@
public:
protected:
AVCodecContext* video_codec_context () const;
protected:
AVCodecContext* video_codec_context () const;
- AVCodecContext*
audio
_codec_context () const;
+ AVCodecContext*
subtitle
_codec_context () const;
boost::shared_ptr<const FFmpegContent> _ffmpeg_content;
boost::shared_ptr<const FFmpegContent> _ffmpeg_content;
@@
-79,8
+79,7
@@
protected:
private:
void setup_general ();
private:
void setup_general ();
- void setup_video ();
- void setup_audio ();
+ void setup_decoders ();
};
#endif
};
#endif