1
0
mirror of https://github.com/mpv-player/mpv synced 2025-01-09 16:39:49 +00:00

Correct stream-seekability tests in demux_audio and demux_lavf

Based on a patch by Alexander Kanavin (alexander.kanavin nokia com)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27250 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2008-07-11 17:25:37 +00:00
parent 8833f7c4ce
commit 3ee9460505
2 changed files with 2 additions and 2 deletions

View File

@ -329,7 +329,7 @@ static int demux_audio_open(demuxer_t* demuxer) {
sh_audio->i_bps = sh_audio->wf->nAvgBytesPerSec;
free(mp3_found);
mp3_found = NULL;
if(s->end_pos) {
if(s->end_pos && (s->flags & STREAM_SEEK) == STREAM_SEEK) {
char tag[4];
stream_seek(s,s->end_pos-128);
stream_read(s,tag,3);

View File

@ -454,7 +454,7 @@ static demuxer_t* demux_open_lavf(demuxer_t *demuxer){
priv->pb = av_alloc_put_byte(priv->buffer, BIO_BUFFER_SIZE, 0,
demuxer->stream, mp_read, NULL, mp_seek);
priv->pb->is_streamed = !demuxer->stream->end_pos;
priv->pb->is_streamed = !demuxer->stream->end_pos || (s->flags & STREAM_SEEK) != STREAM_SEEK;
if(av_open_input_stream(&avfc, priv->pb, mp_filename, priv->avif, &ap)<0){
mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF_header: av_open_input_stream() failed\n");