...
 
Commits (6)
......@@ -19,11 +19,14 @@ notifications:
env:
matrix:
- ROS_DISTRO="kinetic" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu USE_DEB=true
- ROS_DISTRO="indigo" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu USE_DEB=true
- ROS_DISTRO="kinetic" PRERELEASE=true PRERELEASE_DOWNSTREAM_DEPTH=0
- ROS_DISTRO="indigo" PRERELEASE=true PRERELEASE_DOWNSTREAM_DEPTH=0
matrix:
allow_failures:
- env: ROS_DISTRO="kinetic" PRERELEASE=true PRERELEASE_DOWNSTREAM_DEPTH=0
- env: ROS_DISTRO="indigo" PRERELEASE=true PRERELEASE_DOWNSTREAM_DEPTH=0
branches:
only:
......
......@@ -24,11 +24,11 @@ ImageTransportImageStreamer::ImageTransportImageStreamer(const async_web_server_
void ImageTransportImageStreamer::start()
{
image_transport::TransportHints hints(default_transport_);
ros::master::V_TopicInfo master_topics;
ros::master::getTopics(master_topics);
ros::master::V_TopicInfo available_topics;
ros::master::getTopics(available_topics);
inactive_ = true;
for (size_t it = 0; it<master_topics.size(); it++){
if(master_topics[it].name == topic_){
for (size_t it = 0; it<available_topics.size(); it++){
if(available_topics[it].name == topic_){
inactive_ = false;
}
}
......
......@@ -77,10 +77,11 @@ LibavStreamer::~LibavStreamer()
}
if (io_buffer_)
delete io_buffer_;
if (format_context_->pb)
av_free(format_context_->pb);
if (format_context_)
if (format_context_) {
if (format_context_->pb)
av_free(format_context_->pb);
avformat_free_context(format_context_);
}
if (sws_context_)
sws_freeContext(sws_context_);
}
......