Commit b4cd017f authored by conrad's avatar conrad

Merge branch '1.0-stable'

parents a96f5333 0a530b31
......@@ -1090,7 +1090,7 @@ const oggz_auto_contenttype_t oggz_auto_codec_ident[] = {
{"Speex", 5, "Speex", auto_speex, auto_calc_speex, NULL},
{"PCM ", 8, "PCM", auto_oggpcm2, NULL, NULL},
{"CMML\0\0\0\0", 8, "CMML", auto_cmml, NULL, NULL},
{"Annodex", 8, "Annodex", auto_annodex, NULL, NULL},
{"Annodex", 7, "Annodex", auto_annodex, NULL, NULL},
{"fishead", 7, "Skeleton", auto_fishead, NULL, NULL},
{"fLaC", 4, "Flac0", auto_flac0, auto_calc_flac, NULL},
{"\177FLAC", 5, "Flac", auto_flac, auto_calc_flac, NULL},
......
......@@ -317,14 +317,14 @@ oggz_read_deliver_packet(void *elem) {
if (p->stream->read_packet) {
if ((cb_ret = p->stream->read_packet(p->oggz, &(p->zp), p->serialno,
p->stream->read_user_data)) != 0) {
p->stream->read_user_data)) < 0) {
p->oggz->cb_next = cb_ret;
if (cb_ret == -1)
return DLIST_ITER_ERROR;
}
} else if (p->reader->read_packet) {
if ((cb_ret = p->reader->read_packet(p->oggz, &(p->zp), p->serialno,
p->reader->read_user_data)) != 0) {
p->reader->read_user_data)) < 0) {
p->oggz->cb_next = cb_ret;
if (cb_ret == -1)
return DLIST_ITER_ERROR;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment