← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/libvlc.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:
src/libvlc.c
2
2
 * libvlc.c: libvlc instances creation and deletion, interfaces handling
3
3
 *****************************************************************************
4
4
 * Copyright (C) 1998-2008 the VideoLAN team
5
 
 * $Id: b11f40fc1ef69ddb86bcd93c275bc0f8468864d6 $
 
5
 * $Id: dd4412c5a3df59e40224853c2fd387bb34d5bd9d $
6
6
 *
7
7
 * Authors: Vincent Seguin <seguin@via.ecp.fr>
8
8
 *          Samuel Hocevar <sam@zoy.org>
802
802
    var_Create( p_libvlc, "snapshot-file", VLC_VAR_STRING );
803
803
    var_Create( p_libvlc, "record-file", VLC_VAR_STRING );
804
804
 
 
805
    /* some default internal settings */
 
806
    var_Create( p_libvlc, "user-agent", VLC_VAR_STRING );
 
807
    var_SetString( p_libvlc, "user-agent", "(LibVLC "VERSION")" );
 
808
 
805
809
    /* Initialize playlist and get commandline files */
806
810
    p_playlist = playlist_Create( VLC_OBJECT(p_libvlc) );
807
811
    if( !p_playlist )
935
939
        if( psz_codecs )
936
940
        {
937
941
            char *psz_morecodecs;
938
 
            if( asprintf(&psz_morecodecs, "%s,dmo,quicktime", psz_codecs) != -1 )
 
942
            if( asprintf(&psz_morecodecs, "%s,dmo", psz_codecs) != -1 )
939
943
            {
940
944
                var_SetString( p_libvlc, "codec", psz_morecodecs);
941
945
                free( psz_morecodecs );
943
947
            free( psz_codecs );
944
948
        }
945
949
        else
946
 
            var_SetString( p_libvlc, "codec", "dmo,quicktime");
 
950
            var_SetString( p_libvlc, "codec", "dmo");
947
951
    }
948
952
#endif
949
953
 
 
954
#ifdef __APPLE__
950
955
    var_Create( p_libvlc, "drawable-view-top", VLC_VAR_INTEGER );
951
956
    var_Create( p_libvlc, "drawable-view-left", VLC_VAR_INTEGER );
952
957
    var_Create( p_libvlc, "drawable-view-bottom", VLC_VAR_INTEGER );
955
960
    var_Create( p_libvlc, "drawable-clip-left", VLC_VAR_INTEGER );
956
961
    var_Create( p_libvlc, "drawable-clip-bottom", VLC_VAR_INTEGER );
957
962
    var_Create( p_libvlc, "drawable-clip-right", VLC_VAR_INTEGER );
 
963
#endif
958
964
#ifdef WIN32
959
965
    var_Create( p_libvlc, "drawable-hwnd", VLC_VAR_ADDRESS );
960
966
#endif