diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-11-21 15:09:06 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-11-21 15:09:06 +0100 |
| commit | 0970bbad497389e152cbe47192e61329d4d3ad9f (patch) | |
| tree | b0acda1542bce98335cc270697197eb75f44a8bf | |
| parent | a5b14062b4c8941aab05340c8f26705e57478879 (diff) | |
Imported Upstream version 1.0.3upstream/1.0.3
| -rw-r--r-- | ChangeLog | 31 | ||||
| -rw-r--r-- | NEWS | 6 | ||||
| -rwxr-xr-x | configure | 34 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | ext/libav/gstavcodecmap.c | 83 | ||||
| -rw-r--r-- | gst-libav.doap | 10 | ||||
| -rw-r--r-- | gst-libav.spec | 2 | ||||
| -rw-r--r-- | gst-libs/ext/Makefile.am | 2 | ||||
| -rw-r--r-- | gst-libs/ext/Makefile.in | 2 |
9 files changed, 75 insertions, 99 deletions
@@ -1,9 +1,36 @@ +=== release 1.0.3 === + +2012-11-21 Tim-Philipp Müller <tim@centricular.net> + + * configure.ac: + releasing 1.0.3 + +2012-11-19 14:10:23 +0100 Sebastian Dröge <sebastian.droege@collabora.co.uk> + + * ext/libav/gstavcodecmap.c: + avcodecmap: Y41B is YUV411P, not YUV410P + +2012-10-29 14:12:03 +0100 Sebastian Dröge <sebastian.droege@collabora.co.uk> + + * ext/libav/gstavcodecmap.c: + avcodecmap: Remove redundant function to map PixelFormat to GstVideoFormat + And merge everything into a single one. + +2012-10-25 12:54:40 +0100 Tim-Philipp Müller <tim.muller@collabora.co.uk> + + * configure.ac: + Back to development (bug fixing) + === release 1.0.2 === -2012-10-25 Tim-Philipp Müller <tim@centricular.net> +2012-10-25 01:34:32 +0100 Tim-Philipp Müller <tim@centricular.net> + * ChangeLog: + * NEWS: + * RELEASE: * configure.ac: - releasing 1.0.2 + * gst-libav.doap: + Release 1.0.2 2012-10-24 16:01:36 +0200 Sebastian Dröge <sebastian.droege@collabora.co.uk> @@ -1,4 +1,8 @@ -This is GStreamer Libav Plugins 1.0.2 +This is GStreamer Libav Plugins 1.0.3 + +Changes since 1.0.2: + + * avcodecmap: Y41B is YUV411P, not YUV410P Changes since 1.0.1: @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for GStreamer libav 1.0.2. +# Generated by GNU Autoconf 2.69 for GStreamer libav 1.0.3. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer>. # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='GStreamer libav' PACKAGE_TARNAME='gst-libav' -PACKAGE_VERSION='1.0.2' -PACKAGE_STRING='GStreamer libav 1.0.2' +PACKAGE_VERSION='1.0.3' +PACKAGE_STRING='GStreamer libav 1.0.3' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer' PACKAGE_URL='' @@ -1505,7 +1505,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GStreamer libav 1.0.2 to adapt to many kinds of systems. +\`configure' configures GStreamer libav 1.0.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1576,7 +1576,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GStreamer libav 1.0.2:";; + short | recursive ) echo "Configuration of GStreamer libav 1.0.3:";; esac cat <<\_ACEOF @@ -1738,7 +1738,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GStreamer libav configure 1.0.2 +GStreamer libav configure 1.0.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2153,7 +2153,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GStreamer libav $as_me 1.0.2, which was +It was created by GStreamer libav $as_me 1.0.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3083,7 +3083,7 @@ fi # Define the identity of the package. PACKAGE='gst-libav' - VERSION='1.0.2' + VERSION='1.0.3' cat >>confdefs.h <<_ACEOF @@ -3206,9 +3206,9 @@ $as_echo "$am_cv_prog_tar_ustar" >&6; } - PACKAGE_VERSION_MAJOR=$(echo 1.0.2 | cut -d'.' -f1) - PACKAGE_VERSION_MINOR=$(echo 1.0.2 | cut -d'.' -f2) - PACKAGE_VERSION_MICRO=$(echo 1.0.2 | cut -d'.' -f3) + PACKAGE_VERSION_MAJOR=$(echo 1.0.3 | cut -d'.' -f1) + PACKAGE_VERSION_MINOR=$(echo 1.0.3 | cut -d'.' -f2) + PACKAGE_VERSION_MICRO=$(echo 1.0.3 | cut -d'.' -f3) @@ -3219,7 +3219,7 @@ $as_echo "$am_cv_prog_tar_ustar" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking nano version" >&5 $as_echo_n "checking nano version... " >&6; } - NANO=$(echo 1.0.2 | cut -d'.' -f4) + NANO=$(echo 1.0.3 | cut -d'.' -f4) if test x"$NANO" = x || test "x$NANO" = "x0" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: 0 (release)" >&5 @@ -7798,10 +7798,10 @@ fi done - GST_CURRENT=2 + GST_CURRENT=3 GST_REVISION=0 - GST_AGE=2 - GST_LIBVERSION=2:0:2 + GST_AGE=3 + GST_LIBVERSION=3:0:3 @@ -17810,7 +17810,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GStreamer libav $as_me 1.0.2, which was +This file was extended by GStreamer libav $as_me 1.0.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17876,7 +17876,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GStreamer libav config.status 1.0.2 +GStreamer libav config.status 1.0.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 28b78c5..2504ea6 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ(2.62) dnl initialize autoconf dnl when going to/from release please set the nano (fourth number) right ! dnl releases only do Wall, cvs and prerelease does Werror too -AC_INIT(GStreamer libav, 1.0.2, +AC_INIT(GStreamer libav, 1.0.3, http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer, gst-libav) @@ -42,7 +42,7 @@ GST_API_VERSION=1.0 AC_SUBST(GST_API_VERSION) AG_GST_LIBTOOL_PREPARE -AS_LIBTOOL(GST, 2, 0, 2) +AS_LIBTOOL(GST, 3, 0, 3) dnl *** required versions of GStreamer stuff *** GST_REQ=1.0.0 diff --git a/ext/libav/gstavcodecmap.c b/ext/libav/gstavcodecmap.c index 2dd123a..10b310e 100644 --- a/ext/libav/gstavcodecmap.c +++ b/ext/libav/gstavcodecmap.c @@ -1757,76 +1757,6 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id, return caps; } -/* Convert a FFMPEG Pixel Format to a GStreamer VideoFormat */ -GstVideoFormat -gst_ffmpeg_pixfmt_to_video_format (enum PixelFormat pix_fmt) -{ - GstVideoFormat fmt; - - switch (pix_fmt) { - case PIX_FMT_YUVJ420P: - case PIX_FMT_YUV420P: - fmt = GST_VIDEO_FORMAT_I420; - break; - case PIX_FMT_YUVA420P: - fmt = GST_VIDEO_FORMAT_A420; - break; - case PIX_FMT_YUYV422: - fmt = GST_VIDEO_FORMAT_YUY2; - break; - case PIX_FMT_RGB24: - fmt = GST_VIDEO_FORMAT_RGB; - break; - case PIX_FMT_BGR24: - fmt = GST_VIDEO_FORMAT_BGR; - break; - case PIX_FMT_YUVJ422P: - case PIX_FMT_YUV422P: - fmt = GST_VIDEO_FORMAT_Y42B; - break; - case PIX_FMT_YUVJ444P: - case PIX_FMT_YUV444P: - fmt = GST_VIDEO_FORMAT_Y444; - break; - case PIX_FMT_RGB32: -#if (G_BYTE_ORDER == G_BIG_ENDIAN) - fmt = GST_VIDEO_FORMAT_xRGB; -#else - fmt = GST_VIDEO_FORMAT_BGRx; -#endif - break; - case PIX_FMT_YUV410P: - fmt = GST_VIDEO_FORMAT_YUV9; - break; - case PIX_FMT_YUV411P: - fmt = GST_VIDEO_FORMAT_Y41B; - break; - case PIX_FMT_RGB565: - fmt = GST_VIDEO_FORMAT_RGB16; - break; - case PIX_FMT_RGB555: - fmt = GST_VIDEO_FORMAT_RGB15; - break; - case PIX_FMT_PAL8: - fmt = GST_VIDEO_FORMAT_RGB8P; - break; - case PIX_FMT_GRAY8: - fmt = GST_VIDEO_FORMAT_GRAY8; - break; - case PIX_FMT_YUV420P10LE: - fmt = GST_VIDEO_FORMAT_I420_10LE; - break; - case PIX_FMT_YUV420P10BE: - fmt = GST_VIDEO_FORMAT_I420_10BE; - break; - default: - /* give up ... */ - fmt = GST_VIDEO_FORMAT_UNKNOWN; - break; - } - return fmt; -} - /* Convert a FFMPEG Pixel Format and optional AVCodecContext * to a GstCaps. If the context is ommitted, no fixed values * for video/audio size will be included in the GstCaps @@ -1841,7 +1771,7 @@ gst_ffmpeg_pixfmt_to_caps (enum PixelFormat pix_fmt, AVCodecContext * context, GstCaps *caps = NULL; GstVideoFormat format; - format = gst_ffmpeg_pixfmt_to_video_format (pix_fmt); + format = gst_ffmpeg_pixfmt_to_videoformat (pix_fmt); if (format != GST_VIDEO_FORMAT_UNKNOWN) { caps = gst_ff_vid_caps_new (context, codec_id, TRUE, "video/x-raw", @@ -2195,17 +2125,19 @@ static const PixToFmt pixtofmttable[] = { /* GST_VIDEO_FORMAT_xRGB, */ /* GST_VIDEO_FORMAT_xBGR, */ /* GST_VIDEO_FORMAT_RGBA, */ - {GST_VIDEO_FORMAT_RGBA, PIX_FMT_RGB32}, + {GST_VIDEO_FORMAT_RGBA, PIX_FMT_RGBA}, /* GST_VIDEO_FORMAT_BGRA, */ - {GST_VIDEO_FORMAT_BGRA, PIX_FMT_BGR32}, + {GST_VIDEO_FORMAT_BGRA, PIX_FMT_BGRA}, /* GST_VIDEO_FORMAT_ARGB, */ + {GST_VIDEO_FORMAT_ARGB, PIX_FMT_ARGB}, /* GST_VIDEO_FORMAT_ABGR, */ + {GST_VIDEO_FORMAT_ABGR, PIX_FMT_ABGR}, /* GST_VIDEO_FORMAT_RGB, */ {GST_VIDEO_FORMAT_RGB, PIX_FMT_RGB24}, /* GST_VIDEO_FORMAT_BGR, */ {GST_VIDEO_FORMAT_BGR, PIX_FMT_BGR24}, /* GST_VIDEO_FORMAT_Y41B, */ - {GST_VIDEO_FORMAT_Y41B, PIX_FMT_YUV410P}, + {GST_VIDEO_FORMAT_Y41B, PIX_FMT_YUV411P}, /* GST_VIDEO_FORMAT_Y42B, */ {GST_VIDEO_FORMAT_Y42B, PIX_FMT_YUV422P}, {GST_VIDEO_FORMAT_Y42B, PIX_FMT_YUVJ422P}, @@ -2240,11 +2172,14 @@ static const PixToFmt pixtofmttable[] = { /* GST_VIDEO_FORMAT_RGB8_PALETTED, */ {GST_VIDEO_FORMAT_RGB8P, PIX_FMT_PAL8}, /* GST_VIDEO_FORMAT_YUV9, */ + {GST_VIDEO_FORMAT_YUV9, PIX_FMT_YUV410P}, /* GST_VIDEO_FORMAT_YVU9, */ /* GST_VIDEO_FORMAT_IYU1, */ /* GST_VIDEO_FORMAT_ARGB64, */ /* GST_VIDEO_FORMAT_AYUV64, */ /* GST_VIDEO_FORMAT_r210, */ + {GST_VIDEO_FORMAT_I420_10LE, PIX_FMT_YUV420P10LE}, + {GST_VIDEO_FORMAT_I420_10BE, PIX_FMT_YUV420P10BE}, {GST_VIDEO_FORMAT_I422_10LE, PIX_FMT_YUV422P10LE}, {GST_VIDEO_FORMAT_I422_10BE, PIX_FMT_YUV422P10BE}, }; diff --git a/gst-libav.doap b/gst-libav.doap index 7db19fe..5b71519 100644 --- a/gst-libav.doap +++ b/gst-libav.doap @@ -34,6 +34,16 @@ colorspace conversion elements. <release> <Version> + <revision>1.0.3</revision> + <branch>1.0</branch> + <name></name> + <created>2012-11-21</created> + <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.0.3.tar.xz" /> + </Version> + </release> + + <release> + <Version> <revision>1.0.2</revision> <branch>1.0</branch> <name></name> diff --git a/gst-libav.spec b/gst-libav.spec index 2f0b5bd..3738d65 100644 --- a/gst-libav.spec +++ b/gst-libav.spec @@ -4,7 +4,7 @@ %define gst_majorminor 1.0 Name: %{gstreamer}-libav -Version: 1.0.2 +Version: 1.0.3 Release: 1 Summary: GStreamer Streaming-media framework plug-in using libav (FFmpeg). Group: Libraries/Multimedia diff --git a/gst-libs/ext/Makefile.am b/gst-libs/ext/Makefile.am index cbd1274..b1054e1 100644 --- a/gst-libs/ext/Makefile.am +++ b/gst-libs/ext/Makefile.am @@ -36,7 +36,7 @@ maintainer-clean: distclean maintainerclean: maintainer-clean dist-local: - GIT_DIR=libav/.git git checkout-index --prefix=$(TMP_DIST_DIR)/libav/ -a + GIT_DIR=libav/.git git checkout-index --prefix=../$(TMP_DIST_DIR)/libav/ -a touch $(TMP_DIST_DIR)/libav/config.mak echo "Patching libav ./configure" sed -e '/Unknown option/ {N;N;s/exit 1//; }' $(TMP_DIST_DIR)/libav/configure > $(TMP_DIST_DIR)/libav/configure.tmp diff --git a/gst-libs/ext/Makefile.in b/gst-libs/ext/Makefile.in index b1ea570..d2731e7 100644 --- a/gst-libs/ext/Makefile.in +++ b/gst-libs/ext/Makefile.in @@ -669,7 +669,7 @@ maintainer-clean: distclean maintainerclean: maintainer-clean dist-local: - GIT_DIR=libav/.git git checkout-index --prefix=$(TMP_DIST_DIR)/libav/ -a + GIT_DIR=libav/.git git checkout-index --prefix=../$(TMP_DIST_DIR)/libav/ -a touch $(TMP_DIST_DIR)/libav/config.mak echo "Patching libav ./configure" sed -e '/Unknown option/ {N;N;s/exit 1//; }' $(TMP_DIST_DIR)/libav/configure > $(TMP_DIST_DIR)/libav/configure.tmp |