X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg.h;h=4299edc28ffdddd273e37dbd9b2a3714467d507e;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=8aaa54f84afab6973938e83eb138a60d6a2fa9c3;hpb=2d24bc7aaed800415bce4fffe06f261d5e9e464a;p=dcpomatic.git diff --git a/src/lib/ffmpeg.h b/src/lib/ffmpeg.h index 8aaa54f84..4299edc28 100644 --- a/src/lib/ffmpeg.h +++ b/src/lib/ffmpeg.h @@ -20,13 +20,13 @@ #ifndef DCPOMATIC_FFMPEG_H #define DCPOMATIC_FFMPEG_H -#include -#include -#include extern "C" { #include } #include "file_group.h" +#include +#include +#include struct AVFilterGraph; struct AVCodecContext; @@ -55,16 +55,15 @@ public: protected: AVCodecContext* video_codec_context () const; - AVCodecContext* audio_codec_context () const; AVCodecContext* subtitle_codec_context () const; - + boost::shared_ptr _ffmpeg_content; uint8_t* _avio_buffer; int _avio_buffer_size; AVIOContext* _avio_context; FileGroup _file_group; - + AVFormatContext* _format_context; AVPacket _packet; AVFrame* _frame;