Attachment #1820 for bug #10874

View | Details | Raw Unified | Return to bug 10874
Collapse All | Expand All




	}
	*bytes = r;

	if (r == 0 && !inputStreamAtEOF(data->inStream) && !data->dc->stop)
#ifdef LEGACY_FLAC
	if (r == 0 && !inputStreamAtEOF(data->inStream) && !data->dc->stop)
		return OggFLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_ERROR;
#else
	if (r == 0 && !data->dc->stop) {
		if (inputStreamAtEOF(data->inStream))
			return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
		else
			return FLAC__STREAM_DECODER_READ_STATUS_ABORT;
	}
#endif

#ifdef LEGACY_FLAC

Return to bug 10874

Lines 99-109 Link Here

(-)mpd-0.12.1-b2/src/inputPlugins/oggflac_plugin.c (-2 / +7 lines)
99	}	99	}
100	*bytes = r;	100	*bytes = r;
101		101
102	if (r == 0 && !inputStreamAtEOF(data->inStream) && !data->dc->stop)
103	#ifdef LEGACY_FLAC	102	#ifdef LEGACY_FLAC
		103	if (r == 0 && !inputStreamAtEOF(data->inStream) && !data->dc->stop)
104	return OggFLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_ERROR;	104	return OggFLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_ERROR;
105	#else	105	#else
106	return FLAC__STREAM_DECODER_READ_STATUS_ABORT;	106	if (r == 0 && !data->dc->stop) {
		107	if (inputStreamAtEOF(data->inStream))
		108	return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
		109	else
		110	return FLAC__STREAM_DECODER_READ_STATUS_ABORT;
		111	}
107	#endif	112	#endif
108		113
109	#ifdef LEGACY_FLAC	114	#ifdef LEGACY_FLAC