diff options
| author | Edward Hervey <bilboed@bilboed.com> | 2005-11-28 15:43:29 +0000 |
|---|---|---|
| committer | Edward Hervey <bilboed@bilboed.com> | 2005-11-28 15:43:29 +0000 |
| commit | 1be0809073743e951c34669ac5a4cc9019554f17 (patch) | |
| tree | 34c52d34c53164cf073969995192e2a21e337801 /ext | |
| parent | f361f010528703b0d2f5154ab93ae6aec0d4f84e (diff) | |
| download | gst-plugins-bad-1be0809073743e951c34669ac5a4cc9019554f17.tar.gz gst-plugins-bad-1be0809073743e951c34669ac5a4cc9019554f17.tar.bz2 gst-plugins-bad-1be0809073743e951c34669ac5a4cc9019554f17.zip | |
ext/faad/gstfaad.c: Handle gracefully the consequence of "Maximum number of scalefactor bands exceeded", which result...
Original commit message from CVS:
* ext/faad/gstfaad.c: (gst_faad_srcgetcaps):
Handle gracefully the consequence of "Maximum number of scalefactor
bands exceeded", which results in 0 channels with samplerates of 0.
* gst/qtdemux/qtdemux.c: (gst_qtdemux_change_state):
Do upward transitions, then call parent state_change, then do
downward transitions.
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/faad/gstfaad.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/faad/gstfaad.c b/ext/faad/gstfaad.c index 2dc96566..6057469c 100644 --- a/ext/faad/gstfaad.c +++ b/ext/faad/gstfaad.c @@ -474,13 +474,13 @@ gst_faad_srcgetcaps (GstPad * pad) if (!str) continue; - if (faad->samplerate != -1) { + if (faad->samplerate > 0) { gst_structure_set (str, "rate", G_TYPE_INT, faad->samplerate, NULL); } else { gst_structure_set (str, "rate", GST_TYPE_INT_RANGE, 8000, 96000, NULL); } - if (faad->channels != -1) { + if (faad->channels > 0) { gst_structure_set (str, "channels", G_TYPE_INT, faad->channels, NULL); /* put channel information here */ |