Avoid a memcpy in the export code.

1 files changed, 8 insertions, 0 deletions

diff --git a/src/lib/ffmpeg_encoder.h b/src/lib/ffmpeg_encoder.h
index 5e6dcecf7..43c0d948b 100644
--- a/src/lib/ffmpeg_encoder.h
+++ b/src/lib/ffmpeg_encoder.h
@@ -61,6 +61,9 @@ private:
 
 	void audio_frame (int size);
 
+	static void buffer_free(void* opaque, uint8_t* data);
+	void buffer_free2(uint8_t* data);
+
 	AVCodec* _video_codec;
 	AVCodecContext* _video_codec_context;
 	AVCodec* _audio_codec;
@@ -90,6 +93,11 @@ private:
 
 	boost::shared_ptr<Butler> _butler;
 
+	/** Store of shared_ptr<Image> to keep them alive whilst raw pointers into
+	    their data have been passed to FFmpeg.
+	*/
+	std::map<uint8_t*, boost::shared_ptr<const Image> > _pending_images;
+
 	static int _video_stream_index;
 	static int _audio_stream_index;
 };