summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiguel Freitas <miguelfreitas@users.sourceforge.net>2002-12-23 21:04:02 +0000
committerMiguel Freitas <miguelfreitas@users.sourceforge.net>2002-12-23 21:04:02 +0000
commit2e4d617680e9668cdde4fca955bc48efd12e4109 (patch)
treecec649cce4876fecb2432ca48d596311f8625aab
parentc246aa729ba44c0ff8097cb953d551472830e37e (diff)
downloadxine-lib-2e4d617680e9668cdde4fca955bc48efd12e4109.tar.gz
xine-lib-2e4d617680e9668cdde4fca955bc48efd12e4109.tar.bz2
merge info for skipped frames
CVS patchset: 3655 CVS date: 2002/12/23 21:04:02
-rw-r--r--src/xine-engine/video_out.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/xine-engine/video_out.c b/src/xine-engine/video_out.c
index 356a261bf..dbe56b13c 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.124 2002/12/22 23:30:29 miguelfreitas Exp $
+ * $Id: video_out.c,v 1.125 2002/12/23 21:04:02 miguelfreitas Exp $
*
* frame allocation / queuing / scheduling / output functions
*/
@@ -361,6 +361,7 @@ static int vo_frame_draw (vo_frame_t *img, xine_stream_t *stream) {
#ifdef LOG
printf ("video_out: bad_frame\n");
#endif
+ extra_info_merge( stream->current_extra_info, img->extra_info );
this->num_frames_skipped++;
}