diff options
| author |  Alexey Yakovenko <wakeroid@gmail.com> | 2010-01-29 23:14:15 +0100 |
|---|---|---|
| committer | Alexey Yakovenko <wakeroid@gmail.com> | 2010-01-29 23:14:15 +0100 |
| commit | 9460844e2a1598dfe24a72dd2a283d02b57caddc (patch) | |
| tree | 0ec32a2b5453d3e5d299aa325b3c5a3be964092a /plugins/vorbis | |
| parent | e09556d82ca4b470dc8f5904a1080dffe2ffeb7b (diff) | |
| parent | feecc0214decb6d1b9911aafe140034449266430 (diff) | |
Merge branch 'master' into devel
Conflicts:
plugins/vorbis/vorbis.c
streamer.c
Diffstat (limited to 'plugins/vorbis')
| -rw-r--r-- | plugins/vorbis/vorbis.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/plugins/vorbis/vorbis.c b/plugins/vorbis/vorbis.c index b2b4e42c..96b25933 100644 --- a/plugins/vorbis/vorbis.c +++ b/plugins/vorbis/vorbis.c @@ -180,6 +180,11 @@ cvorbis_init (DB_playItem_t *it) { plugin.free (_info); return NULL; } + if (info->vi->rate <= 0) { + trace ("vorbis: bad samplerate\n"); + plugin.free (_info); + return NULL; + } _info->plugin = &plugin; _info->bps = 16; //_info->dataSize = ov_pcm_total (&vorbis_file, -1) * vi->channels * 2; |