← Back to branch summary

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

« back to all changes in this revision

Viewing changes to modules/stream_out/standard.c

  • Committer: Bazaar Package Importer
  • Author(s): Benjamin Drung
  • Date: 2010-07-23 10:41:59 UTC
  • mfrom: (1.1.31 upstream)
  • Revision ID: james.westby@ubuntu.com-20100723104159-pudrtu70a1svhiyl
Tags: 1.1.1-1+exp1ubuntu1
* Merge from Debian experimental, 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

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/stream_out/standard.c
2
2
 * standard.c: standard stream output module
3
3
 *****************************************************************************
4
4
 * Copyright (C) 2003-2007 the VideoLAN team
5
 
 * $Id: bf2a0dd16d0fd2aef5d34d5a9034d0cf46368b8f $
 
5
 * $Id: 7210638dbf9da4be7df9ea0944bb8cbc16dda407 $
6
6
 *
7
7
 * Authors: Laurent Aimar <fenrir@via.ecp.fr>
8
8
 *
249
249
            { "avi", "avi" },
250
250
            { "ogg", "ogg" },
251
251
            { "ogm", "ogg" },
 
252
            { "ogv", "ogg" },
 
253
            { "mp3", "raw" },
252
254
            { "mp4", "mp4" },
253
255
            { "mov", "mov" },
254
256
            { "moov","mov" },
268
270
            { "",    "" }
269
271
        };
270
272
        const char *psz_ext = strrchr( psz_url, '.' ) + 1;
271
 
        int  i;
272
273
 
273
274
        msg_Dbg( p_this, "extension is %s", psz_ext );
274
 
        for( i = 0; exttomux[i].ext[0]; i++ )
 
275
        for( int i = 0; exttomux[i].ext[0]; i++ )
275
276
        {
276
277
            if( !strcasecmp( psz_ext, exttomux[i].ext ) )
277
278
            {