plugins/elements/gstfilesrc.c: Also, if mmap() fails that would be a READ error, not OPEN_READ.

Original commit message from CVS:
* plugins/elements/gstfilesrc.c: (gst_file_src_map_region):
Also, if mmap() fails that would be a READ error, not OPEN_READ.
This commit is contained in:
Tim-Philipp Müller 2008-02-20 12:31:50 +00:00
parent 5a0b5789a3
commit 62aa68ade5
2 changed files with 6 additions and 2 deletions

View file

@ -1,3 +1,8 @@
2008-02-20 Tim-Philipp Müller <tim at centricular dot net>
* plugins/elements/gstfilesrc.c: (gst_file_src_map_region):
Also, if mmap() fails that would be a READ error, not OPEN_READ.
2008-02-20 Tim-Philipp Müller <tim at centricular dot net> 2008-02-20 Tim-Philipp Müller <tim at centricular dot net>
* plugins/elements/Makefile.am: * plugins/elements/Makefile.am:
@ -69,7 +74,6 @@
Copy selected buffer-flags when creating subbuffers. Copy selected buffer-flags when creating subbuffers.
Fixes #516395. Fixes #516395.
>>>>>>> 1.3670
2008-02-12 Sebastian Dröge <slomo@circular-chaos.org> 2008-02-12 Sebastian Dröge <slomo@circular-chaos.org>
* gst/gstbuffer.c: (gst_buffer_class_init), (gst_buffer_finalize): * gst/gstbuffer.c: (gst_buffer_class_init), (gst_buffer_finalize):

View file

@ -577,7 +577,7 @@ gst_file_src_map_region (GstFileSrc * src, off_t offset, size_t size,
mmap_failed: mmap_failed:
{ {
if (!testonly) { if (!testonly) {
GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ, (NULL), GST_ELEMENT_ERROR (src, RESOURCE, READ, (NULL),
("mmap (0x%08lx, %d, 0x%" G_GINT64_MODIFIER "x) failed: %s", ("mmap (0x%08lx, %d, 0x%" G_GINT64_MODIFIER "x) failed: %s",
(gulong) size, src->fd, (guint64) offset, g_strerror (errno))); (gulong) size, src->fd, (guint64) offset, g_strerror (errno)));
} }