diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-06-21 18:48:46 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-06-25 16:32:28 +0100 |
| commit | 46cd0fe7b5b514f0d9456b25f670679cc584a218 (patch) | |
| tree | 708a5d638fff8a143502a1820925d3e31d0a1d24 /src/lib/ffmpeg.h | |
| parent | f1bf21a9c2581591ab80bfc997a22b93046f8c56 (diff) | |
Basics of FFmpeg examiner works.
Diffstat (limited to 'src/lib/ffmpeg.h')
| -rw-r--r-- | src/lib/ffmpeg.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/lib/ffmpeg.h b/src/lib/ffmpeg.h index dcafe17f7..4d1a45da3 100644 --- a/src/lib/ffmpeg.h +++ b/src/lib/ffmpeg.h @@ -17,6 +17,9 @@ */ +#ifndef DCPOMATIC_FFMPEG_H +#define DCPOMATIC_FFMPEG_H + #include <vector> #include <boost/shared_ptr.hpp> #include <boost/thread/mutex.hpp> @@ -46,16 +49,16 @@ public: } protected: + AVCodecContext* video_codec_context () const; + AVCodecContext* audio_codec_context () const; + boost::shared_ptr<const FFmpegContent> _ffmpeg_content; + AVFormatContext* _format_context; AVPacket _packet; AVFrame* _frame; - int _video_stream; - AVCodecContext* _video_codec_context; - AVCodec* _video_codec; - AVCodecContext* _audio_codec_context; ///< may be 0 if there is no audio - AVCodec* _audio_codec; ///< may be 0 if there is no audio + int _video_stream; /* It would appear (though not completely verified) that one must have a mutex around calls to avcodec_open* and avcodec_close... and here @@ -68,3 +71,5 @@ private: void setup_video (); void setup_audio (); }; + +#endif |