gst-plugins-bad: applemedia: Fix build on iOS and probably also on OSX

[Andoni Morales]

2014/1/20 Sebastian Dröge <slomo at kemper.freedesktop.org>

> Module: gst-plugins-bad
> Branch: master
> Commit: 1107e158f78741f03a98feff14ea1e20a0ddbdde
> URL:
> http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=1107e158f78741f03a98feff14ea1e20a0ddbdde
>
> Author: Sebastian Dröge <sebastian at centricular.com>
> Date:   Mon Jan 20 10:34:57 2014 +0100
>
> applemedia: Fix build on iOS and probably also on OSX
>
> The video toolbox is not available on iOS, and also on OSX
> we should probably build all source files that are used for
> it.
>
> https://bugzilla.gnome.org/show_bug.cgi?id=722590
>
> ---
>
>  sys/applemedia/Makefile.am |    4 +++-
>  sys/applemedia/plugin.m    |    2 ++
>  2 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/sys/applemedia/Makefile.am b/sys/applemedia/Makefile.am
> index 57b12b9..e30ec1e 100644
> --- a/sys/applemedia/Makefile.am
> +++ b/sys/applemedia/Makefile.am
> @@ -89,7 +89,9 @@ else
>  libgstapplemedia_la_SOURCES +=                 \
>         qtkitvideosrc.m                         \
>         vtenc.c                                 \
> -       vtdec.c
> +       vtdec.c                                 \
> +       vth264decbin.c                          \
> +       vth264encbin.c
>

I don't think the decoding/encoding bins are needed anymore in 1.x. I think
they were used in 0.10 to force parsed h264 in the input of the encoder,
but that should be handled correctly now with the caps.

>
>  libgstapplemedia_la_LDFLAGS +=                 \
>         -Wl,-framework -Wl,Cocoa                \
> diff --git a/sys/applemedia/plugin.m b/sys/applemedia/plugin.m
> index e4fe9e3..098ec90 100644
> --- a/sys/applemedia/plugin.m
> +++ b/sys/applemedia/plugin.m
> @@ -30,9 +30,11 @@
>  #ifdef HAVE_AVFOUNDATION
>  #include "avfvideosrc.h"
>  #endif
> +#ifndef HAVE_IOS
>  #include "vth264decbin.h"
>  #include "vth264encbin.h"
>  #include "vtdec.h"
> +#endif
>  #include "atdec.h"
>
>  #ifndef HAVE_IOS
>
>
> _______________________________________________
> gstreamer-commits mailing list
> gstreamer-commits at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/gstreamer-commits
>
>


-- 
Andoni Morales Alastruey

LongoMatch:The Digital Coach
http://www.longomatch.ylatuya.es
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/gstreamer-devel/attachments/20140120/82724518/attachment.html>