~ubuntu-branches/ubuntu/karmic/vlc/karmic-proposed

« back to all changes in this revision

Viewing changes to modules/stream_out/transcode.c

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2009-07-10 16:18:23 UTC
  • mfrom: (1.1.23 upstream) (3.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20090710161823-3pllnay3xzyougxm
Tags: 1.0.0-1ubuntu1
* Remaining changes to debian:
  - build against libxul-dev instead of iceape-dev
  - build against libass-dev and libx264-dev
  - build against and install libx264 plugin
  - add Xb-Npp header to vlc package

Show diffs side-by-side

added added

removed removed

Lines of Context:
2
2
 * transcode.c: transcoding stream output module
3
3
 *****************************************************************************
4
4
 * Copyright (C) 2003-2008 the VideoLAN team
5
 
 * $Id: b4bf89136ab1126212cc4a0286783aac5d89a22c $
 
5
 * $Id: 818d28c8b251242988cd884689c4f9bd910d72b1 $
6
6
 *
7
7
 * Authors: Laurent Aimar <fenrir@via.ecp.fr>
8
8
 *          Gildas Bazin <gbazin@videolan.org>
2158
2158
        {
2159
2159
            /* Encoder still has stuff to encode, wait to clear-up the list */
2160
2160
            while( p_sys->i_first_pic == i_first_pic )
2161
 
                msleep( 100000 );
 
2161
                msleep( 5000 );
2162
2162
        }
2163
2163
 
2164
2164
        /* Find an empty space in the picture ring buffer */