diff options
author | Tim-Philipp Müller <tim@centricular.net> | 2012-08-18 20:31:17 +0100 |
---|---|---|
committer | Tim-Philipp Müller <tim@centricular.net> | 2012-08-18 20:31:17 +0100 |
commit | cc167a237ac7373139e54f8477affa9e6a1513c7 (patch) | |
tree | 1c29fb29a038e9ca06139884d488edd227f561a4 | |
parent | c36ba564c3b2cf75d8fc7c0e24788c4db2869daa (diff) | |
download | gstreamer-plugins-bad-cc167a237ac7373139e54f8477affa9e6a1513c7.tar.gz |
Fix up FSF address in some source files as well
-rw-r--r-- | ext/wayland/gstwaylandsink.c | 3 | ||||
-rw-r--r-- | ext/wayland/gstwaylandsink.h | 3 | ||||
-rw-r--r-- | gst/mpeg1sys/main.h | 3 | ||||
-rw-r--r-- | gst/rtjpeg/RTjpeg.c | 2 | ||||
-rw-r--r-- | gst/rtjpeg/RTjpeg.h | 2 | ||||
-rw-r--r-- | gst/tta/filters.h | 2 | ||||
-rw-r--r-- | gst/vbidec/vbidata.c | 5 | ||||
-rw-r--r-- | gst/vbidec/vbidata.h | 2 | ||||
-rw-r--r-- | gst/vbidec/vbiscreen.c | 4 | ||||
-rw-r--r-- | gst/vbidec/vbiscreen.h | 2 |
10 files changed, 18 insertions, 10 deletions
diff --git a/ext/wayland/gstwaylandsink.c b/ext/wayland/gstwaylandsink.c index bfe680260..a1af0aea8 100644 --- a/ext/wayland/gstwaylandsink.c +++ b/ext/wayland/gstwaylandsink.c @@ -17,7 +17,8 @@ * * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA. */ /** diff --git a/ext/wayland/gstwaylandsink.h b/ext/wayland/gstwaylandsink.h index 22a4ede61..abef5e6f0 100644 --- a/ext/wayland/gstwaylandsink.h +++ b/ext/wayland/gstwaylandsink.h @@ -15,7 +15,8 @@ * * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA. */ #ifndef __GST_WAYLAND_VIDEO_SINK_H__ diff --git a/gst/mpeg1sys/main.h b/gst/mpeg1sys/main.h index 56e90e992..e9675f6b9 100644 --- a/gst/mpeg1sys/main.h +++ b/gst/mpeg1sys/main.h @@ -31,7 +31,8 @@ * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * +* MA 02110-1301 USA. * *************************************************************************/ diff --git a/gst/rtjpeg/RTjpeg.c b/gst/rtjpeg/RTjpeg.c index 8f959a5a6..e3873542f 100644 --- a/gst/rtjpeg/RTjpeg.c +++ b/gst/rtjpeg/RTjpeg.c @@ -11,7 +11,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. This file is a modified version of RTjpeg 0.1.2, (C) Justin Schoeman 1998 diff --git a/gst/rtjpeg/RTjpeg.h b/gst/rtjpeg/RTjpeg.h index 155e9a336..a2d0dc754 100644 --- a/gst/rtjpeg/RTjpeg.h +++ b/gst/rtjpeg/RTjpeg.h @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. This file is a modified version of RTjpeg 0.1.2, (C) Justin Schoeman 1998 */ diff --git a/gst/tta/filters.h b/gst/tta/filters.h index 3c0694a29..2162b2046 100644 --- a/gst/tta/filters.h +++ b/gst/tta/filters.h @@ -22,7 +22,7 @@ * * You should have received a copy of the GNU General Public License * aint with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * * Please see the file COPYING in this directory for full copyright * information. diff --git a/gst/vbidec/vbidata.c b/gst/vbidec/vbidata.c index 4bcda140a..0abcf8dca 100644 --- a/gst/vbidec/vbidata.c +++ b/gst/vbidec/vbidata.c @@ -23,7 +23,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #ifdef HAVE_CONFIG_H @@ -192,12 +192,15 @@ ccdecode (unsigned char *vbiline) const char *movies[] = { "N/A", "G", "PG", "PG-13", "R", "NC-17", "X", "Not Rated" }; + const char *usa_tv[] = { "Not Rated", "TV-Y", "TV-Y7", "TV-G", "TV-PG", "TV-14", "TV-MA", "Not Rated" }; + const char *cane_tv[] = { "Exempt", "C", "C8+", "G", "PG", "14+", "18+", "Reserved" }; + const char *canf_tv[] = { "Exempt", "G", "8 ans +", "13 ans +", "16 ans +", "18 ans +", "Reserved", "Reserved" diff --git a/gst/vbidec/vbidata.h b/gst/vbidec/vbidata.h index 901fa97c6..c3045335c 100644 --- a/gst/vbidec/vbidata.h +++ b/gst/vbidec/vbidata.h @@ -23,7 +23,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #ifndef VBIDATA_H_INCLUDED diff --git a/gst/vbidec/vbiscreen.c b/gst/vbidec/vbiscreen.c index 0302b5f2c..52e91e0d9 100644 --- a/gst/vbidec/vbiscreen.c +++ b/gst/vbidec/vbiscreen.c @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #ifdef HAVE_CONFIG_H @@ -83,6 +83,7 @@ osd_string_show_text (osd_string_t * os, char *s, int len) gst_vbidec_show_text (os->vbidec, s, len); } } + int osd_string_get_height (osd_string_t * os) { @@ -114,6 +115,7 @@ blit_colour_packed422_scanline (unsigned char *d, int w, int luma, int cb, int cr) { } + int osd_string_visible (osd_string_t * os) { diff --git a/gst/vbidec/vbiscreen.h b/gst/vbidec/vbiscreen.h index 788211e43..d81fb52df 100644 --- a/gst/vbidec/vbiscreen.h +++ b/gst/vbidec/vbiscreen.h @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #ifndef HAVE_VBISCREEN_H |