Release Nageru 1.7.2.

[nageru] / ffmpeg_raii.h

diff --git a/ffmpeg_raii.h b/ffmpeg_raii.h
index d27c20d3b298ec866a6450c6067b404966d6dff8..33d233480528dd8414e92b3fd32b04c1281d4ffa 100644 (file)
--- a/ffmpeg_raii.h
+++ b/ffmpeg_raii.h
@@ -18,40 +18,63 @@ struct AVDictionary;
 struct AVFormatContext;
 struct AVFrame;
 struct AVInputFormat;
-
+struct SwsContext;
+typedef struct AVIOInterruptCB AVIOInterruptCB;
 
 // AVFormatContext
-void avformat_close_input_unique(AVFormatContext *format_ctx);
+struct avformat_close_input_unique {
+       void operator() (AVFormatContext *format_ctx) const;
+};
 
-typedef std::unique_ptr<AVFormatContext, decltype(avformat_close_input_unique)*>
+typedef std::unique_ptr<AVFormatContext, avformat_close_input_unique>
        AVFormatContextWithCloser;
 
 AVFormatContextWithCloser avformat_open_input_unique(
-       const char *pathname, AVInputFormat *fmt, AVDictionary **options);
+       const char *pathname, AVInputFormat *fmt,
+       AVDictionary **options);
+
+AVFormatContextWithCloser avformat_open_input_unique(
+       const char *pathname, AVInputFormat *fmt,
+       AVDictionary **options,
+       const AVIOInterruptCB &interrupt_cb);
 
 
 // AVCodecContext
-void avcodec_free_context_unique(AVCodecContext *codec_ctx);
+struct avcodec_free_context_unique {
+       void operator() (AVCodecContext *ctx) const;
+};
 
-typedef std::unique_ptr<AVCodecContext, decltype(avcodec_free_context_unique)*>
+typedef std::unique_ptr<AVCodecContext, avcodec_free_context_unique>
        AVCodecContextWithDeleter;
 
 AVCodecContextWithDeleter avcodec_alloc_context3_unique(const AVCodec *codec);
 
 
 // AVCodecParameters
-void avcodec_parameters_free_unique(AVCodecParameters *codec_par);
+struct avcodec_parameters_free_unique {
+       void operator() (AVCodecParameters *codec_par) const;
+};
 
-typedef std::unique_ptr<AVCodecParameters, decltype(avcodec_parameters_free_unique)*>
+typedef std::unique_ptr<AVCodecParameters, avcodec_parameters_free_unique>
        AVCodecParametersWithDeleter;
 
 
 // AVFrame
-void av_frame_free_unique(AVFrame *frame);
+struct av_frame_free_unique {
+       void operator() (AVFrame *frame) const;
+};
 
-typedef std::unique_ptr<AVFrame, decltype(av_frame_free_unique)*>
+typedef std::unique_ptr<AVFrame, av_frame_free_unique>
        AVFrameWithDeleter;
 
 AVFrameWithDeleter av_frame_alloc_unique();
 
+// SwsContext
+struct sws_free_context_unique {
+       void operator() (SwsContext *context) const;
+};
+
+typedef std::unique_ptr<SwsContext, sws_free_context_unique>
+       SwsContextWithDeleter;
+
 #endif  // !defined(_FFMPEG_RAII_H)