projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ChangeLog.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg.h
diff --git
a/src/lib/ffmpeg.h
b/src/lib/ffmpeg.h
index c94b8d8ac22ae697db346eb33c25afedb9b83a2d..760918437d403dd0624984e31a07fb0bdddff583 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 {
@@
-52,7
+52,6
@@
public:
int avio_read (uint8_t *, int);
int64_t avio_seek (int64_t, int);
int avio_read (uint8_t *, int);
int64_t avio_seek (int64_t, int);
- int64_t avio_length ();
protected:
AVCodecContext* video_codec_context () const;
protected:
AVCodecContext* video_codec_context () const;
@@
-68,7
+67,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
@@
-78,7
+78,7
@@
protected:
static boost::mutex _mutex;
private:
static boost::mutex _mutex;
private:
- void setup_general (
bool
);
+ void setup_general ();
void setup_video ();
void setup_audio ();
};
void setup_video ();
void setup_audio ();
};