Mercurial > mplayer.hg

diff libmpdemux/demux_lavf.c @ 29920:4f740437ed2b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Finally rename the STREAM_SEEK define to MP_STREAM_SEEK, there are just too many name clashes, in particular with Windows headers (which define STREAM_SEEK as an enum type).
author reimar
date Sun, 22 Nov 2009 15:18:21 +0000
parents fef2308ae98e
children e31fc74955d5
line wrap: on
line diff
--- a/libmpdemux/demux_lavf.c	Sun Nov 22 15:10:50 2009 +0000
+++ b/libmpdemux/demux_lavf.c	Sun Nov 22 15:18:21 2009 +0000
@@ -465,7 +465,7 @@
 
     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 || (demuxer->stream->flags & STREAM_SEEK) != STREAM_SEEK;
+    priv->pb->is_streamed = !demuxer->stream->end_pos || (demuxer->stream->flags & MP_STREAM_SEEK) != MP_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");