mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 18:05:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

configure.ac: Fix indentation, fix v4l2 plugin detection.

Browse source 
Original commit message from CVS:
* configure.ac:
Fix indentation, fix v4l2 plugin detection.
* ext/Makefile.am:
Fix libmms location (Maciej, use diff -u!).
* ext/alsa/gstalsa.c: (gst_alsa_init):
Initialize caps cache to NULL.
* gst/playback/gstplaybin.c: (gst_play_bin_change_state):
Only change state on audiosink if it exists.
This commit is contained in:
Ronald S. Bultje 2004-12-29 13:27:45 +00:00
parent 7bbdae8b7c
commit df80b706a7
5 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2004-12-29 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* configure.ac:
Fix indentation, fix v4l2 plugin detection.
* ext/Makefile.am:
Fix libmms location (Maciej, use diff -u!).
* ext/alsa/gstalsa.c: (gst_alsa_init):
Initialize caps cache to NULL.
* gst/playback/gstplaybin.c: (gst_play_bin_change_state):
Only change state on audiosink if it exists.
2004-12-28 Maciej Katafiasz <mathrick@mathrick.org> 2004-12-28 Maciej Katafiasz <mathrick@mathrick.org>
* gst/matroska/matroska-demux.c: * gst/matroska/matroska-demux.c:

7
configure.ac
View file

@ -411,7 +411,7 @@ GST_PLUGINS_ALL="\
synaesthesia \ synaesthesia \
tags \ tags \
tcp \ tcp \
tta \ tta \
typefind \ typefind \
udp \ udp \
vbidec \ vbidec \
@ -688,6 +688,7 @@ GST_CHECK_FEATURE(GST_V4L, [Video 4 Linux], v4lsrc v4lmjpegsrc v4lmjpegsink, [
AC_CHECK_DECL(VID_TYPE_MPEG_ENCODER, HAVE_GST_V4L="yes", HAVE_GST_V4L="no", [ AC_CHECK_DECL(VID_TYPE_MPEG_ENCODER, HAVE_GST_V4L="yes", HAVE_GST_V4L="no", [
#include <sys/types.h> #include <sys/types.h>
#define _LINUX_TIME_H #define _LINUX_TIME_H
#define __user
#include <linux/videodev.h> #include <linux/videodev.h>
]) ])
fi fi
@ -706,6 +707,7 @@ GST_CHECK_FEATURE(GST_V4L2, [Video 4 Linux 2], v4l2src, [
#include <sys/types.h> #include <sys/types.h>
#include <linux/types.h> #include <linux/types.h>
#define _LINUX_TIME_H #define _LINUX_TIME_H
#define __user
#include <linux/videodev2.h> #include <linux/videodev2.h>
#if defined(V4L2_MAJOR_VERSION) || defined(V4L2_MINOR_VERSION) #if defined(V4L2_MAJOR_VERSION) || defined(V4L2_MINOR_VERSION)
#error too early v4l2 version or no v4l2 at all #error too early v4l2 version or no v4l2 at all
@ -727,6 +729,7 @@ return 0;
#include <sys/types.h> #include <sys/types.h>
#include <linux/types.h> #include <linux/types.h>
#define _LINUX_TIME_H #define _LINUX_TIME_H
#define __user
#include <linux/videodev2.h> #include <linux/videodev2.h>
],[ ],[
struct v4l2_buffer buf; struct v4l2_buffer buf;
@ -1437,8 +1440,6 @@ GST_CHECK_FEATURE(MUSEPACK, [musepackdec], musepack, [
AC_CHECK_HEADER([musepack/mpc_dec.h], [ AC_CHECK_HEADER([musepack/mpc_dec.h], [
HAVE_MUSEPACK="yes" HAVE_MUSEPACK="yes"
MUSEPACK_LIBS="-lmusepack" MUSEPACK_LIBS="-lmusepack"
MUSEPACK_CFLAGS=
AC_SUBST(MUSEPACK_CFLAGS)
AC_SUBST(MUSEPACK_LIBS) AC_SUBST(MUSEPACK_LIBS)
], [HAVE_MUSEPACK="no"]) ], [HAVE_MUSEPACK="no"])
AC_LANG_C AC_LANG_C

2
ext/Makefile.am
View file

@ -479,7 +479,6 @@ DIST_SUBDIRS=\
dvdread \ dvdread \
dvdnav \ dvdnav \
esd \ esd \
libmms \
faac \ faac \
faad \ faad \
flac \ flac \
@ -496,6 +495,7 @@ DIST_SUBDIRS=\
libcaca \ libcaca \
libfame \ libfame \
libmng \ libmng \
libmms \
libpng \ libpng \
librfb \ librfb \
libvisual \ libvisual \

1
ext/alsa/gstalsa.c
View file

@ -211,6 +211,7 @@ static void
gst_alsa_init (GstAlsa * this) gst_alsa_init (GstAlsa * this)
{ {
this->device = g_strdup ("default"); this->device = g_strdup ("default");
this->cached_caps = NULL;
GST_FLAG_SET (this, GST_ELEMENT_EVENT_AWARE); GST_FLAG_SET (this, GST_ELEMENT_EVENT_AWARE);
GST_FLAG_SET (this, GST_ELEMENT_THREAD_SUGGESTED); GST_FLAG_SET (this, GST_ELEMENT_THREAD_SUGGESTED);

3
gst/playback/gstplaybin.c
View file

@ -790,7 +790,8 @@ gst_play_bin_change_state (GstElement * element)
case GST_STATE_PLAYING_TO_PAUSED: case GST_STATE_PLAYING_TO_PAUSED:
/* Set audio sink state to NULL to release the sound device, /* Set audio sink state to NULL to release the sound device,
* but only if we own it (else we might be in chain-transition). */ * but only if we own it (else we might be in chain-transition). */
if (GST_STATE (play_bin->audio_sink) == GST_STATE_PAUSED) { if (play_bin->audio_sink != NULL &&
GST_STATE (play_bin->audio_sink) == GST_STATE_PAUSED) {
gst_element_set_state (play_bin->audio_sink, GST_STATE_NULL); gst_element_set_state (play_bin->audio_sink, GST_STATE_NULL);
} }
break; break;