projects
/
platform
/
upstream
/
gst-plugins-good.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a965185
)
avidemux: only check video compression for video streams
author
Wim Taymans
<wim.taymans@collabora.co.uk>
Wed, 4 Sep 2013 13:25:39 +0000
(15:25 +0200)
committer
Wim Taymans
<wim.taymans@collabora.co.uk>
Wed, 4 Sep 2013 13:53:05 +0000
(15:53 +0200)
Or else we might deref a stream with a NULL strf.vids and segfault
gst/avi/gstavidemux.c
patch
|
blob
|
history
diff --git
a/gst/avi/gstavidemux.c
b/gst/avi/gstavidemux.c
index
d4aa1d6
..
79f1c23
100644
(file)
--- a/
gst/avi/gstavidemux.c
+++ b/
gst/avi/gstavidemux.c
@@
-2716,7
+2716,8
@@
gst_avi_demux_parse_index (GstAviDemux * avi, GstBuffer * buf)
if (stream->strh->type == GST_RIFF_FCC_auds) {
/* all audio frames are keyframes */
ENTRY_SET_KEYFRAME (&entry);
- } else if (stream->strf.vids->compression == GST_RIFF_DXSB) {
+ } else if (stream->strh->type == GST_RIFF_FCC_vids &&
+ stream->strf.vids->compression == GST_RIFF_DXSB) {
/* all xsub frames are keyframes */
ENTRY_SET_KEYFRAME (&entry);
} else {