diff options
| author | Stefan Holst <holstsn@users.sourceforge.net> | 2005-02-13 22:12:50 +0000 |
|---|---|---|
| committer | Stefan Holst <holstsn@users.sourceforge.net> | 2005-02-13 22:12:50 +0000 |
| commit | e951b2650d1c83c36c1b8ada04d5eeb9a17d0364 (patch) | |
| tree | 2c57d47f993e9912c8a89ac841c1649d1b3425f9 /src/xine-engine/video_out.c | |
| parent | 723b57cb57fdcdf8d1673256826cfbef14aa9488 (diff) | |
| download | xine-lib-e951b2650d1c83c36c1b8ada04d5eeb9a17d0364.tar.gz xine-lib-e951b2650d1c83c36c1b8ada04d5eeb9a17d0364.tar.bz2 | |
nitpick: reset MAX_AUDIO_CHANNEL and MAX_SPU_CHANNEL together with other stream info in xine_close
CVS patchset: 7411
CVS date: 2005/02/13 22:12:50
Diffstat (limited to 'src/xine-engine/video_out.c')
| -rw-r--r-- | src/xine-engine/video_out.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/xine-engine/video_out.c b/src/xine-engine/video_out.c index 1c489747e..c56fef829 100644 --- a/src/xine-engine/video_out.c +++ b/src/xine-engine/video_out.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_out.c,v 1.214 2004/12/12 22:01:32 mroi Exp $ + * $Id: video_out.c,v 1.215 2005/02/13 22:12:50 holstsn Exp $ * * frame allocation / queuing / scheduling / output functions */ @@ -484,6 +484,7 @@ static int vo_frame_draw (vo_frame_t *img, xine_stream_t *stream) { if (stream->first_frame_flag == 2) { if (this->grab_only) { stream->first_frame_flag = 0; + xprintf (stream->xine, XINE_VERBOSITY_DEBUG, "first frame reached 1\n"); pthread_cond_broadcast(&stream->first_frame_reached); } else stream->first_frame_flag = 1; @@ -669,7 +670,7 @@ static vo_frame_t * duplicate_frame( vos_t *this, vo_frame_t *img ) { dupl->proc_called = 0; dupl->duration = img->duration; - dupl->is_first = img->is_first; + dupl->is_first = 0; dupl->stream = NULL; memcpy( dupl->extra_info, img->extra_info, sizeof(extra_info_t) ); @@ -944,6 +945,7 @@ static void overlay_and_display_frame (vos_t *this, pthread_mutex_lock (&stream->first_frame_lock); if (stream->first_frame_flag) { stream->first_frame_flag = 0; + xprintf (stream->xine, XINE_VERBOSITY_DEBUG, "first frame reached 2\n"); pthread_cond_broadcast(&stream->first_frame_reached); } pthread_mutex_unlock (&stream->first_frame_lock); |
