← Back to branch summary

~ubuntu-branches/ubuntu/lucid/vlc/lucid

« back to all changes in this revision

Viewing changes to modules/access_filter/timeshift.c

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2008-10-12 11:37:03 UTC
  • mfrom: (1.1.19 upstream)
  • Revision ID: james.westby@ubuntu.com-20081012113703-z0kp136a10fcsjqj
Tags: 0.9.4-1ubuntu1
https://launchpad.net/bugs/280081
https://launchpad.net/bugs/280378
* merge from debian/experimental
* New upstream release fixes LP: #280081, #280378
* remaining changes:
  - build against libxul-dev instead of iceape-dev
  - build against libdca-dev, libass-dev and libx264-dev
  - adjust Vcs-Bzr Headers in debian/control
  - add Xb-Npp header to vlc package
  - debian/patches/301_DVD_media.diff: Change %U to %f
     in VLC .desktop file, cf LP #275043

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/access_filter/timeshift.c
2
2
 * timeshift.c: access filter implementing timeshifting capabilities
3
3
 *****************************************************************************
4
4
 * Copyright (C) 2005 the VideoLAN team
5
 
 * $Id: 6567e22c57cde4579c3030dd69f4dc7999c3a22d $
 
5
 * $Id: b943e90a0bbcbdce2121dbe8541fe28ad46d2733 $
6
6
 *
7
7
 * Authors: Laurent Aimar <fenrir@via.ecp.fr>
8
8
 *          Gildas Bazin <gbazin@videolan.org>
298
298
              block_Release( p_block );
299
299
              p_block = NULL;
300
300
            }
301
 
            p_block->i_buffer = i_read;
 
301
            else
 
302
                p_block->i_buffer = i_read;
302
303
        }
303
304
 
304
305
        if( p_block == NULL )