Skip to content

Commit

Permalink
Merge branch 'dev-0.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
Fabian Solano committed Jul 29, 2019
2 parents 093369f + 1473fec commit b1a49ed
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 21 deletions.
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ dnl required version of autoconf
AC_PREREQ([2.53])

dnl TODO: fill in your package name and package version here
AC_INIT([gst-perf],[0.2.3])
AC_INIT([gst-perf],[0.2.4])

dnl required versions of gstreamer and plugins-base
GST_REQUIRED=1.0.0
Expand Down
22 changes: 12 additions & 10 deletions plugins/gstperf.c
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
/* GStreamer
* Copyright (C) 2013 RidgeRun, LLC (http://www.ridgerun.com)
* Copyright (C) 2019 RidgeRun, LLC (http://www.ridgerun.com)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses>.
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
/**
* SECTION:element-perf
Expand Down
22 changes: 12 additions & 10 deletions plugins/gstperf.h
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
/* GStreamer
* Copyright (C) 2013 RidgeRun, LLC (http://www.ridgerun.com)
* Copyright (C) 2019 RidgeRun, LLC (http://www.ridgerun.com)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses>.
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/

#ifndef _GST_PERF_H_
Expand Down

0 comments on commit b1a49ed

Please sign in to comment.