Merge tizen patch based on 1.12.2

Change-Id:I7ac13674c3157645193c99fa2b40805df2b76831

diff --cc .gbs.conf
index 0000000,7302e56..3033b86
mode 000000,100644..100644
--- /dev/null
--- 2/.gbs.conf
+++ b/.gbs.conf
@@@ -1,0 -1,3 +1,3 @@@
 -upstream_branch = upstream/1.6
+ [general]
++upstream_branch = upstream/1.12
+ upstream_tag = ${upstreamversion}

diff --cc Makefile.am
Simple merge

diff --cc RELEASE
index 604abec,ed6b670..f24a847
--- 1/RELEASE
--- 2/RELEASE
+++ b/RELEASE
@@@ -1,18 -1,29 +1,16 @@@
  
 -Release notes for GStreamer libav Plugins 1.6.1
 +Release notes for GStreamer libav Plugins 1.12.2
  
 +The GStreamer team is proud to announce the second bugfix release in the stable
 +1.12 release series of your favourite cross-platform multimedia framework!
  
 -The GStreamer team is proud to announce the first bugfix release in the stable
 -1.6 release series of your favourite cross-platform multimedia framework!
 -
 -
 -Binaries for Android, iOS, Mac OS X and Windows are provided by the
 -GStreamer project for this release.
--
 -This release only contains bugfixes and it is safe to update from 1.6.0. For a
 +This release only contains bugfixes and it is safe to update from 1.12.x. For a
  full list of bugfixes see Bugzilla.
  
 -The 1.x series is a stable series targeted at end users. It is not API
 -or ABI compatible with the 0.10.x series. It can, however, be installed
 -in parallel with the 0.10.x series and will not affect an existing
 -0.10.x installation.
--
 +See /releases/1.12/ for the full release notes.
  
 -See http://gstreamer.freedesktop.org/releases/1.6/
 -for the full release notes.
  
 -
 -
 -This module contains plugins based on the libav project, including codecs.
 +This module contains plugins based on the ffmpeg project, including codecs.
  
  
  
@@@ -70,5 -85,6 +68,6 @@@ subscribe to the gstreamer-devel list
          
  Contributors to this release
      
+       * Luis de Bethencourt
        * Sebastian Dröge
-- 
++ 

diff --cc autogen.sh
index 6a65a1a,2a0ffe8..262493e
--- 1/autogen.sh
--- 2/autogen.sh
+++ b/autogen.sh
@@@ -50,12 -46,10 +50,12 @@@ if test -d po ; the
    touch -t 200001010000 po/gst-libav-1.0.pot
  fi
  
- CONFIGURE_DEF_OPT='--enable-maintainer-mode --enable-gtk-doc'
+ CONFIGURE_DEF_OPT='--enable-maintainer-mode'
  
  if test "x$package" = "xgstreamer"; then
 -  CONFIGURE_DEF_OPT="$CONFIGURE_DEF_OPT --enable-docbook --enable-failing-tests --enable-poisoning"
 +  CONFIGURE_DEF_OPT="$CONFIGURE_DEF_OPT --enable-failing-tests --enable-poisoning"
 +elif test "x$package" = "xgst-plugins-bad"; then
 +  CONFIGURE_DEF_OPT="$CONFIGURE_DEF_OPT --with-player-tests"
  fi
  
  autogen_options $@

diff --cc docs/plugins/inspect/plugin-libav.xml
index 23dae8c,59b5f16..9fa52d6
--- 1/docs/plugins/inspect/plugin-libav.xml
--- 2/docs/plugins/inspect/plugin-libav.xml
+++ b/docs/plugins/inspect/plugin-libav.xml
@@@ -11731,4 -11452,4 +11731,4 @@@
        </pads>
      </element>
    </elements>
--</plugin>
++</plugin>

diff --cc ext/libav/gstav.c
index 1482bae,12e3502..9b0164b
--- 1/ext/libav/gstav.c
--- 2/ext/libav/gstav.c
+++ b/ext/libav/gstav.c
@@@ -158,9 -126,8 +158,9 @@@ plugin_init (GstPlugin * plugin
    gst_ffmpeg_init_pix_fmt_info ();
  
    av_register_all ();
 +  avfilter_register_all ();
  
-   gst_ffmpegaudenc_register (plugin);
+ #ifndef TIZEN_PRODUCT_TV
    gst_ffmpegvidenc_register (plugin);
    gst_ffmpegauddec_register (plugin);
    gst_ffmpegviddec_register (plugin);

diff --cc ext/libav/gstavauddec.c
index 9aa45e3,119a97c..9aa45e3
mode 100644,100755..100755
--- 1/ext/libav/gstavauddec.c
--- 2/ext/libav/gstavauddec.c
+++ b/ext/libav/gstavauddec.c

diff --cc ext/libav/gstavaudenc.c
index 6ffbc3e,f07ee3a..baa6c7a
mode 100644,100755..100755
--- 1/ext/libav/gstavaudenc.c
--- 2/ext/libav/gstavaudenc.c
+++ b/ext/libav/gstavaudenc.c

diff --cc ext/libav/gstavcodecmap.c
Simple merge

diff --cc ext/libav/gstavdemux.c
Simple merge

diff --cc ext/libav/gstavmux.c
index 54a6c1d,d2c464a..07262ed
mode 100644,100755..100755
--- 1/ext/libav/gstavmux.c
--- 2/ext/libav/gstavmux.c
+++ b/ext/libav/gstavmux.c

diff --cc ext/libav/gstavviddec.c
index 251823b,c853dd1..251823b
mode 100644,100755..100755
--- 1/ext/libav/gstavviddec.c
--- 2/ext/libav/gstavviddec.c
+++ b/ext/libav/gstavviddec.c

diff --cc ext/libav/gstavvidenc.c
index f4c2f40,8ce1a7a..f4c2f40
mode 100644,100755..100755
--- 1/ext/libav/gstavvidenc.c
--- 2/ext/libav/gstavvidenc.c
+++ b/ext/libav/gstavvidenc.c

diff --cc packaging/common.tar.gz
index 0000000,25c8f79..c3aef17
mode 000000,100644..100644
Binary files differ

diff --cc packaging/gst-libav.spec
index 0000000,ae1b784..37343f9
mode 000000,100644..100644
--- /dev/null
--- 2/packaging/gst-libav.spec
+++ b/packaging/gst-libav.spec
@@@ -1,0 -1,69 +1,69 @@@
 -Version:    1.6.1
 -Release:    4
+ Name:       gst-libav
+ Summary:    Libav plugin for GStreamer
++Version:    1.12.2
++Release:    0
+ Group:      Multimedia/Framework
+ License:    LGPL-2.0+
+ Source:     %{name}-%{version}.tar.gz
+ Source100:  common.tar.gz
+ Source101:  libav.tar.gz
+ URL:        http://cgit.freedesktop.org/gstreamer/gst-libav
+ BuildRequires:  gettext
+ BuildRequires:  which
+ BuildRequires:  yasm
+ BuildRequires:  bzip2-devel
+ BuildRequires:  pkgconfig(gstreamer-1.0)
+ BuildRequires:  pkgconfig(gstreamer-plugins-base-1.0)
+ BuildRequires:  pkgconfig(glib-2.0)
+ BuildRequires:  pkgconfig(zlib)
+ BuildRequires:  pkgconfig(vorbis)
+ BuildRequires:  pkgconfig(theora)
+ BuildRequires:  pkgconfig(orc-0.4)
+ 
+ %description
+ This GStreamer plugin supports a large number of audio and video compression
+ formats through the use of the libav library.  The plugin contains GStreamer
+ elements for decoding 90+ formats (AVI, MPEG, OGG, Matroska, ASF, ...),
+ demuxing 30+ formats and colorspace conversion.
+ 
+ 
+ %prep
+ %setup -q -n gst-libav-%{version}
+ %setup -q -T -D -a 100
+ %setup -q -T -D -a 101
+ 
+ %build
+ NOCONFIGURE=1 ./autogen.sh
+ 
+ export CFLAGS+=" -Wall -g -fPIC\
+  -DGST_TIZEN_MODIFICATION\
+  -DTIZEN_FEATURE_LIBAV   \
+ %if "%{TIZEN_PRODUCT_TV}" == "1"
+  -DTIZEN_PRODUCT_TV \
+ %endif
+  -DLIBAV_RANK_MODIFICATION"
+ 
+ EXTRA_CONFIGURE="--disable-demuxer=mm --disable-decoder=jpeg2000"
+ %{?asan:EXTRA_CONFIGURE="$EXTRA_CONFIGURE --disable-inline-asm"}
+ %configure  --disable-static \
+       --enable-lgpl\
+       --disable-jpeg\
+       --prefix=%{_prefix} \
+       --with-html-dir=/tmp/dump\
+       --with-libav-extra-configure="$EXTRA_CONFIGURE"
+ 
+ 
+ make %{?jobs:-j%jobs}
+ 
+ %install
+ rm -rf %{buildroot}
+ %make_install
+ 
+ 
+ %files
+ %manifest %{name}.manifest
+ %defattr(-,root,root,-)
+ %license COPYING.LIB
+ %{_libdir}/gstreamer-1.0/libgstlibav.so
+ 
+ 

diff --cc packaging/libav.tar.gz
index 0000000,d14ccf1..735412c
mode 000000,100644..100644
Binary files differ