diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2003-01-14 00:10:28 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2003-01-14 00:10:28 +0000 |
| commit | 74641d0374d17b28fb4636f890bd62e43c9a603c (patch) | |
| tree | f11433bc5bc2cd04ced568bf1e1265f0a26d643d /src | |
| parent | a671bbb6f834ce7b7d54fdd841204bb8c66f15bb (diff) | |
| download | xine-lib-74641d0374d17b28fb4636f890bd62e43c9a603c.tar.gz xine-lib-74641d0374d17b28fb4636f890bd62e43c9a603c.tar.bz2 | |
move default handled flag to xine.c. this fixes false alarm with -A null.
CVS patchset: 3909
CVS date: 2003/01/14 00:10:28
Diffstat (limited to 'src')
| -rw-r--r-- | src/xine-engine/audio_decoder.c | 4 | ||||
| -rw-r--r-- | src/xine-engine/video_decoder.c | 4 | ||||
| -rw-r--r-- | src/xine-engine/xine.c | 8 |
3 files changed, 9 insertions, 7 deletions
diff --git a/src/xine-engine/audio_decoder.c b/src/xine-engine/audio_decoder.c index 68ab6e0ea..930654ef0 100644 --- a/src/xine-engine/audio_decoder.c +++ b/src/xine-engine/audio_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: audio_decoder.c,v 1.101 2003/01/13 23:02:41 miguelfreitas Exp $ + * $Id: audio_decoder.c,v 1.102 2003/01/14 00:10:28 miguelfreitas Exp $ * * * functions that implement audio decoding @@ -97,8 +97,6 @@ void *audio_decoder_loop (void *stream_gen) { stream->metronom->handle_audio_discontinuity (stream->metronom, DISC_STREAMSTART, 0); - /* assume handled, we will known after trying to init decoder */ - stream->stream_info[XINE_STREAM_INFO_AUDIO_HANDLED] = 1; buftype_unknown = 0; break; diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c index 678775c28..f51363bc7 100644 --- a/src/xine-engine/video_decoder.c +++ b/src/xine-engine/video_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_decoder.c,v 1.123 2003/01/09 02:44:39 miguelfreitas Exp $ + * $Id: video_decoder.c,v 1.124 2003/01/14 00:10:29 miguelfreitas Exp $ * */ @@ -107,8 +107,6 @@ void *video_decoder_loop (void *stream_gen) { stream->metronom->handle_video_discontinuity (stream->metronom, DISC_STREAMSTART, 0); - /* assume handled, we will known after trying to init decoder */ - stream->stream_info[XINE_STREAM_INFO_VIDEO_HANDLED] = 1; buftype_unknown = 0; break; diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index dfabc315b..1b77f7361 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine.c,v 1.220 2003/01/13 23:03:13 miguelfreitas Exp $ + * $Id: xine.c,v 1.221 2003/01/14 00:10:31 miguelfreitas Exp $ * * top-level xine functions * @@ -721,6 +721,12 @@ static int xine_open_internal (xine_stream_t *stream, const char *mrl) { extra_info_reset( stream->video_decoder_extra_info ); extra_info_reset( stream->audio_decoder_extra_info ); + /* assume handled for now. we will only know for sure after trying + * to init decoders (which should happen when headers are sent) + */ + stream->stream_info[XINE_STREAM_INFO_VIDEO_HANDLED] = 1; + stream->stream_info[XINE_STREAM_INFO_AUDIO_HANDLED] = 1; + /* * send and decode headers */ |