projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Split DCP panel up into general (at the top) then video/audio tabs.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg.h
diff --git
a/src/lib/ffmpeg.h
b/src/lib/ffmpeg.h
index 182ee634b4aadfc6c0e1c5c21f549f9346943c74..8aaa54f84afab6973938e83eb138a60d6a2fa9c3 100644
(file)
--- a/
src/lib/ffmpeg.h
+++ b/
src/lib/ffmpeg.h
@@
-43,7
+43,7
@@
class FFmpegContent;
class FFmpeg
{
public:
class FFmpeg
{
public:
- FFmpeg (boost::shared_ptr<const FFmpegContent>
, bool
);
+ FFmpeg (boost::shared_ptr<const FFmpegContent>);
virtual ~FFmpeg ();
boost::shared_ptr<const FFmpegContent> ffmpeg_content () const {
virtual ~FFmpeg ();
boost::shared_ptr<const FFmpegContent> ffmpeg_content () const {
@@
-56,6
+56,7
@@
public:
protected:
AVCodecContext* video_codec_context () const;
AVCodecContext* audio_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;
@@
-67,7
+68,8
@@
protected:
AVFormatContext* _format_context;
AVPacket _packet;
AVFrame* _frame;
AVFormatContext* _format_context;
AVPacket _packet;
AVFrame* _frame;
-
+
+ /** Index of video stream within AVFormatContext */
int _video_stream;
/* It would appear (though not completely verified) that one must have
int _video_stream;
/* It would appear (though not completely verified) that one must have
@@
-77,9
+79,8
@@
protected:
static boost::mutex _mutex;
private:
static boost::mutex _mutex;
private:
- void setup_general (bool);
- void setup_video ();
- void setup_audio ();
+ void setup_general ();
+ void setup_decoders ();
};
#endif
};
#endif