diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-04-18 10:23:45 +0200 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-04-18 10:23:45 +0200 |
| commit | 7555d0949f231f2263b45b0e791a1884fdc2c771 (patch) | |
| tree | f4a09aefcf97006a60303e8b93392de6b18788f7 /gst/imagefreeze | |
| parent | 8a4ae3dd2de4de1a11d982102e3881e313d4f37a (diff) | |
| parent | 75d5c41f2903b6703aa4d70b5f9fce6db1ad1e03 (diff) | |
Merge branch 'master' into 0.11
Conflicts:
android/apetag.mk
android/avi.mk
android/flv.mk
android/icydemux.mk
android/id3demux.mk
android/qtdemux.mk
android/rtp.mk
android/rtpmanager.mk
android/rtsp.mk
android/soup.mk
android/udp.mk
android/wavenc.mk
android/wavparse.mk
configure.ac
Diffstat (limited to 'gst/imagefreeze')
| -rw-r--r-- | gst/imagefreeze/Makefile.am | 13 | ||||
| -rw-r--r-- | gst/imagefreeze/gstimagefreeze.c | 6 |
2 files changed, 15 insertions, 4 deletions
diff --git a/gst/imagefreeze/Makefile.am b/gst/imagefreeze/Makefile.am index af96a98c1..7aa861431 100644 --- a/gst/imagefreeze/Makefile.am +++ b/gst/imagefreeze/Makefile.am @@ -9,3 +9,16 @@ libgstimagefreeze_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = gstimagefreeze.h +Android.mk: Makefile.am $(BUILT_SOURCES) + androgenizer \ + -:PROJECT libgstimagefreeze -:SHARED libgstimagefreeze \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgstimagefreeze_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstimagefreeze_la_CFLAGS) \ + -:LDFLAGS $(libgstimagefreeze_la_LDFLAGS) \ + $(libgstimagefreeze_la_LIBADD) \ + -ldl \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ + > $@ diff --git a/gst/imagefreeze/gstimagefreeze.c b/gst/imagefreeze/gstimagefreeze.c index d6a3a9cf3..3e122adca 100644 --- a/gst/imagefreeze/gstimagefreeze.c +++ b/gst/imagefreeze/gstimagefreeze.c @@ -608,7 +608,7 @@ gst_image_freeze_src_event (GstPad * pad, GstEvent * event) &stop_type, &stop); gst_event_unref (event); - flush = ! !(flags & GST_SEEK_FLAG_FLUSH); + flush = !!(flags & GST_SEEK_FLAG_FLUSH); if (format != GST_FORMAT_TIME && format != GST_FORMAT_DEFAULT) { GST_ERROR_OBJECT (pad, "Seek in invalid format: %s", @@ -744,7 +744,7 @@ gst_image_freeze_src_loop (GstPad * pad) GstImageFreeze *self = GST_IMAGE_FREEZE (GST_PAD_PARENT (pad)); GstBuffer *buffer; guint64 offset; - GstClockTime timestamp, timestamp_end, duration; + GstClockTime timestamp, timestamp_end; gint64 cstart, cstop; gboolean in_seg, eos; @@ -800,11 +800,9 @@ gst_image_freeze_src_loop (GstPad * pad) timestamp_end = gst_util_uint64_scale (offset + 1, self->fps_d * GST_SECOND, self->fps_n); - duration = timestamp_end - timestamp; } else { timestamp = self->segment.start; timestamp_end = GST_CLOCK_TIME_NONE; - duration = GST_CLOCK_TIME_NONE; } eos = (self->fps_n == 0 && offset > 0) || |