summaryrefslogtreecommitdiffstats
path: root/src/uscxml/plugins/invoker/ffmpeg/FFMPEGInvoker.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/uscxml/plugins/invoker/ffmpeg/FFMPEGInvoker.cpp')
-rw-r--r--src/uscxml/plugins/invoker/ffmpeg/FFMPEGInvoker.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/uscxml/plugins/invoker/ffmpeg/FFMPEGInvoker.cpp b/src/uscxml/plugins/invoker/ffmpeg/FFMPEGInvoker.cpp
index 4a0ec00..eda4ce8 100644
--- a/src/uscxml/plugins/invoker/ffmpeg/FFMPEGInvoker.cpp
+++ b/src/uscxml/plugins/invoker/ffmpeg/FFMPEGInvoker.cpp
@@ -373,7 +373,7 @@ void FFMPEGInvoker::openVideo(EncodingContext* ctx, AVFormatContext *oc, AVCodec
*((AVPicture *)ctx->frame) = ctx->dst_picture;
}
-void FFMPEGInvoker::writeVideoFrame(EncodingContext* ctx, AVFormatContext *oc, AVStream *st, boost::shared_ptr<Blob> image) {
+void FFMPEGInvoker::writeVideoFrame(EncodingContext* ctx, AVFormatContext *oc, AVStream *st, Blob image) {
int ret;
AVCodecContext *c = st->codec;
@@ -392,14 +392,14 @@ void FFMPEGInvoker::writeVideoFrame(EncodingContext* ctx, AVFormatContext *oc, A
}
uint32_t headerOffset = 0;
- headerOffset += image->data[10] << 0;
- headerOffset += image->data[11] << 8;
- headerOffset += image->data[12] << 16;
- headerOffset += image->data[13] << 24;
+ headerOffset += image._impl->data[10] << 0;
+ headerOffset += image._impl->data[11] << 8;
+ headerOffset += image._impl->data[12] << 16;
+ headerOffset += image._impl->data[13] << 24;
// std::cout << headerOffset + (c->width * c->height) << " / " << image->_size << std::endl;
- ret = avpicture_fill(&ctx->src_picture, (uint8_t*)(image->data + headerOffset), BMP_FORMAT, c->width, c->height);
+ ret = avpicture_fill(&ctx->src_picture, (uint8_t*)(image._impl->data + headerOffset), BMP_FORMAT, c->width, c->height);
if (ret < 0) {
fprintf(stderr,
"Could not fill image from given bitmap\n");
@@ -408,7 +408,7 @@ void FFMPEGInvoker::writeVideoFrame(EncodingContext* ctx, AVFormatContext *oc, A
(const uint8_t * const *)ctx->src_picture.data, ctx->src_picture.linesize,
0, c->height, ctx->dst_picture.data, ctx->dst_picture.linesize);
} else {
- avpicture_fill(&ctx->dst_picture, (uint8_t*)image->data, c->pix_fmt, c->width, c->height);
+ avpicture_fill(&ctx->dst_picture, (uint8_t*)image._impl->data, c->pix_fmt, c->width, c->height);
}
if (oc->oformat->flags & AVFMT_RAWPICTURE) {