mirror of https://github.com/mpv-player/mpv
Make fill_buffer function check for stream eof, fixes hang at eof (bug #580)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19966 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
abfb2f049a
commit
8e6272e832
|
@ -569,7 +569,7 @@ static int demux_real_fill_buffer(demuxer_t *demuxer, demux_stream_t *dsds)
|
||||||
int x, sps, cfs, sph, spc, w;
|
int x, sps, cfs, sph, spc, w;
|
||||||
int audioreorder_getnextpk = 0;
|
int audioreorder_getnextpk = 0;
|
||||||
|
|
||||||
while(1){
|
while(!stream_eof(demuxer->stream)){
|
||||||
|
|
||||||
/* Handle audio/video demxing switch for multirate files (non-interleaved) */
|
/* Handle audio/video demxing switch for multirate files (non-interleaved) */
|
||||||
if (priv->is_multirate && priv->stream_switch) {
|
if (priv->is_multirate && priv->stream_switch) {
|
||||||
|
@ -1075,6 +1075,7 @@ if((unsigned)stream_id<MAX_STREAMS){
|
||||||
discard:
|
discard:
|
||||||
stream_skip(demuxer->stream, len);
|
stream_skip(demuxer->stream, len);
|
||||||
}// goto loop;
|
}// goto loop;
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
extern void print_wave_header(WAVEFORMATEX *h, int verbose_level);
|
extern void print_wave_header(WAVEFORMATEX *h, int verbose_level);
|
||||||
|
|
Loading…
Reference in New Issue