summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
m---------common0
-rw-r--r--gst/avi/gstavidemux.c6
3 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index bb005bac..813104b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-14 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+
+ Patch by: Alessandro Decina <alessandro at nnva dot org>
+
+ * gst/avi/gstavidemux.c: (gst_avi_demux_riff_parse_vprp):
+ Fix build of avidemux on big endian architectures.
+
2008-07-10 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Patch by: Thiago Sousa Santos <thiagoss at lcc dot ufcg dot edu dot br>
diff --git a/common b/common
-Subproject 79ade7b9c9bf47eee491ceee4cf3ea116140ad3
+Subproject a100efef186a5f8999fe3aa42c0720f5123c08e
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c
index a48ceee4..eceff00e 100644
--- a/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@ -1254,7 +1254,7 @@ gst_avi_demux_riff_parse_vprp (GstElement * element,
for (k = 0; k < vprp->fields; k++) {
gst_riff_vprp_video_field_desc *fd;
- fd = &(vidpad->vprp.field_info[k]);
+ fd = &vprp->field_info[k];
fd->compressed_bm_height = GUINT32_FROM_LE (fd->compressed_bm_height);
fd->compressed_bm_width = GUINT32_FROM_LE (fd->compressed_bm_width);
fd->valid_bm_height = GUINT32_FROM_LE (fd->valid_bm_height);
@@ -1811,8 +1811,8 @@ gst_avi_demux_parse_index (GstAviDemux * avi,
target->index_nr = i;
target->flags =
- (entry.
- flags & GST_RIFF_IF_KEYFRAME) ? GST_AVI_INDEX_ENTRY_FLAG_KEYFRAME : 0;
+ (entry.flags & GST_RIFF_IF_KEYFRAME) ? GST_AVI_INDEX_ENTRY_FLAG_KEYFRAME
+ : 0;
target->size = entry.size;
target->offset = entry.offset + 8;