summaryrefslogtreecommitdiffstats
path: root/gst/avi
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2003-01-30 18:14:39 +0000
committerWim Taymans <wim.taymans@gmail.com>2003-01-30 18:14:39 +0000
commit1655534c37c79dabe7b232bca02cbec683af5411 (patch)
tree2760218e68b79263212e187144849d282f479617 /gst/avi
parent7e4720f88ce8c0aac3047bf4404dd3afdac2f088 (diff)
Don't use samplesize on video frames
Original commit message from CVS: Don't use samplesize on video frames
Diffstat (limited to 'gst/avi')
-rw-r--r--gst/avi/gstavidemux.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c
index 53d05021..a6b17a33 100644
--- a/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@ -770,7 +770,7 @@ gst_avi_demux_parse_index (GstAviDemux *avi_demux,
}
/* constant rate stream */
- if (stream->strh.samplesize) {
+ if (stream->strh.samplesize && stream->strh.type == GST_RIFF_FCC_auds) {
gst_pad_convert (stream->pad, GST_FORMAT_BYTES, stream->total_bytes,
&format, &target->ts);
}
@@ -870,7 +870,7 @@ gst_avi_demux_src_convert (GstPad *pad, GstFormat src_format, gint64 src_value,
avi_stream_context *stream = gst_pad_get_element_private (pad);
if (stream->strh.type != GST_RIFF_FCC_auds &&
- (src_format == GST_FORMAT_BYTES || *dest_format == GST_FORMAT_BYTES))
+ (src_format == GST_FORMAT_BYTES || *dest_format == GST_FORMAT_BYTES))
return FALSE;
switch (src_format) {
@@ -962,7 +962,7 @@ gst_avi_demux_handle_src_query (GstPad *pad, GstQueryType type,
*format = GST_FORMAT_TIME;
/* fall through */
case GST_FORMAT_TIME:
- if (stream->strh.samplesize) {
+ if (stream->strh.samplesize && stream->strh.type == GST_RIFF_FCC_auds) {
*value = (((gfloat)stream->current_byte) * stream->strh.scale / stream->strh.rate) * GST_SECOND;
}
else {
@@ -973,7 +973,7 @@ gst_avi_demux_handle_src_query (GstPad *pad, GstQueryType type,
*value = stream->current_byte;
break;
case GST_FORMAT_UNITS:
- if (stream->strh.samplesize)
+ if (stream->strh.samplesize && stream->strh.type == GST_RIFF_FCC_auds)
*value = stream->current_byte * stream->strh.samplesize;
else
*value = stream->current_frame;