X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fffmpeg%2Fproducer%2Ffilter%2Ffilter.cpp;h=19bc662e09fe12440eddc67d22942b600f546bb5;hb=2d143b976d9f3a3c0a2473b93b544900bae88e32;hp=6ab130890bf8350e8f0b84330a7c6506284014cd;hpb=57173f7eb898ccf1bbf475bac6654d204d06ff31;p=casparcg diff --git a/modules/ffmpeg/producer/filter/filter.cpp b/modules/ffmpeg/producer/filter/filter.cpp index 6ab130890..19bc662e0 100644 --- a/modules/ffmpeg/producer/filter/filter.cpp +++ b/modules/ffmpeg/producer/filter/filter.cpp @@ -115,7 +115,7 @@ struct filter::implementation std::stringstream args; args << frame->width << ":" << frame->height << ":" << frame->format << ":" << 0 << ":" << 0 << ":" << 0 << ":" << 0; // don't care about pts and aspect_ratio THROW_ON_ERROR2(avfilter_graph_create_filter(&buffersrc_ctx_, avfilter_get_by_name("buffer"), "src", args.str().c_str(), NULL, graph_.get()), "[filter]"); - + #if FF_API_OLD_VSINK_API THROW_ON_ERROR2(avfilter_graph_create_filter(&buffersink_ctx_, avfilter_get_by_name("buffersink"), "out", NULL, pix_fmts_.data(), graph_.get()), "[filter]"); #else @@ -234,7 +234,7 @@ filter::filter(filter&& other) : impl_(std::move(other.impl_)){} filter& filter::operator=(filter&& other){impl_ = std::move(other.impl_); return *this;} void filter::push(const std::shared_ptr& frame){impl_->push(frame);} std::shared_ptr filter::poll(){return impl_->poll();} -std::string filter::filter_str() const{return impl_->filters_;} +std::wstring filter::filter_str() const{return widen(impl_->filters_);} std::vector> filter::poll_all() { std::vector> frames;