← Back to branch summary

~ubuntu-branches/ubuntu/natty/vlc/natty

« back to all changes in this revision

Viewing changes to modules/demux/asf/libasf.c

  • Committer: Bazaar Package Importer
  • Author(s): Benjamin Drung
  • Date: 2010-06-25 01:09:16 UTC
  • mfrom: (1.1.30 upstream)
  • Revision ID: james.westby@ubuntu.com-20100625010916-asxhep2mutg6g6pd
Tags: 1.1.0-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - build and install the libx264 plugin
  - add Xb-Npp header to vlc package
  - Add apport hook to include more vlc dependencies in bug reports
* Drop xulrunner patches.
* Drop 502_xulrunner_191.diff.

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/demux/asf/libasf.c
2
2
 * libasf.c : asf stream demux module for vlc
3
3
 *****************************************************************************
4
4
 * Copyright (C) 2001-2003 the VideoLAN team
5
 
 * $Id: 4ffabcba06ffdeddf7786e27f6b0a0e8a2774075 $
 
5
 * $Id: 803c849b18a4c43967ffd1bb9f9fd7465916a208 $
6
6
 *
7
7
 * Authors: Laurent Aimar <fenrir@via.ecp.fr>
8
8
 *          Gildas Bazin <gbazin@videolan.org>
108
108
            int i;
109
109
            for( i = 0; i < i_size/2; i++ )
110
110
                psz_string[i] = GetWLE( &p_data[2*i] );
111
 
            psz_string[i_size/2] = '\0'; \
 
111
            psz_string[i_size/2] = '\0';
112
112
        }
113
113
    }
114
114
    else
434
434
        /* Read data */
435
435
        if( p_record->i_type == ASF_METADATA_TYPE_STRING )
436
436
        {
437
 
            p_record->p_data = ASF_READS( i_data );
 
437
            p_record->p_data = (uint8_t *)ASF_READS( i_data );
438
438
            p_record->i_data = i_data/2; /* FIXME Is that needed ? */
439
439
        }
440
440
        else if( p_record->i_type == ASF_METADATA_TYPE_BYTE )