projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No-op: remove all trailing whitespace.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg.h
diff --git
a/src/lib/ffmpeg.h
b/src/lib/ffmpeg.h
index 8aaa54f84afab6973938e83eb138a60d6a2fa9c3..4299edc28ffdddd273e37dbd9b2a3714467d507e 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,16
+55,15
@@
public:
protected:
AVCodecContext* video_codec_context () const;
protected:
AVCodecContext* video_codec_context () const;
- AVCodecContext* audio_codec_context () const;
AVCodecContext* subtitle_codec_context () const;
AVCodecContext* subtitle_codec_context () const;
-
+
boost::shared_ptr<const FFmpegContent> _ffmpeg_content;
uint8_t* _avio_buffer;
int _avio_buffer_size;
AVIOContext* _avio_context;
FileGroup _file_group;
boost::shared_ptr<const FFmpegContent> _ffmpeg_content;
uint8_t* _avio_buffer;
int _avio_buffer_size;
AVIOContext* _avio_context;
FileGroup _file_group;
-
+
AVFormatContext* _format_context;
AVPacket _packet;
AVFrame* _frame;
AVFormatContext* _format_context;
AVPacket _packet;
AVFrame* _frame;