May 2012 - MPlayer-cvslog - lists.mplayerhq.hu

r34939 - in trunk: gui/ui/gtk/fileselect.c help/help_mp-de.h help/help_mp-en.h
by ib 21 May '12

21 May '12

Author: ib Date: Mon May 21 12:33:08 2012 New Revision: 34939 Log: Enable translation of font file filter items. Modified: trunk/gui/ui/gtk/fileselect.c Changes in other areas also in this revision: Modified: trunk/help/help_mp-de.h trunk/help/help_mp-en.h Modified: trunk/gui/ui/gtk/fileselect.c ============================================================================== --- trunk/gui/ui/gtk/fileselect.c Mon May 21 12:03:57 2012 (r34938) +++ trunk/gui/ui/gtk/fileselect.c Mon May 21 12:33:08 2012 (r34939) @@ -132,13 +132,13 @@ int fsLastAudioFilterSelected = -1; char * fsFontFileNames[][2] = { #ifdef CONFIG_FREETYPE - { "True Type fonts (*.ttf)", "*.ttf" }, - { "Type1 fonts (*.pfb)", "*.pfb" }, - { "All fonts", "*.ttf,*.pfb" }, + { MSGTR_Filter_TTF, "*.ttf" }, + { MSGTR_Filter_Type1, "*.pfb" }, + { MSGTR_Filter_AllFonts, "*.ttf,*.pfb" }, #else - { "Font files (*.desc)", "*.desc" }, + { MSGTR_Filter_FontFiles, "*.desc" }, #endif - { "All files", "*" }, + { MSGTR_Filter_AllFiles, "*" }, { NULL,NULL } }; int fsLastFontFilterSelected = -1;

1 0

r34938 - in trunk: gui/ui/gtk/fileselect.c help/help_mp-de.h help/help_mp-en.h
by ib 21 May '12

21 May '12

Author: ib Date: Mon May 21 12:03:57 2012 New Revision: 34938 Log: Enable translation of subtitle file filter items. Modified: trunk/gui/ui/gtk/fileselect.c Changes in other areas also in this revision: Modified: trunk/help/help_mp-de.h trunk/help/help_mp-en.h Modified: trunk/gui/ui/gtk/fileselect.c ============================================================================== --- trunk/gui/ui/gtk/fileselect.c Mon May 21 11:52:25 2012 (r34937) +++ trunk/gui/ui/gtk/fileselect.c Mon May 21 12:03:57 2012 (r34938) @@ -104,8 +104,8 @@ char * fsSubtitleFilterNames[][2] = { "MicroDVD (*.sub)", "*.sub" }, { "Text (*.txt)", "*.txt" }, { "UTF (*.utf)", "*.utf" }, - { "All subtitles", "*.aqt,*.ass,*.jss,*.rt,*.smi,*.srt,*.ssa,*.sub,*.txt,*.utf" }, - { "All files", "*" }, + { MSGTR_Filter_AllSubtitles, "*.aqt,*.ass,*.jss,*.rt,*.smi,*.srt,*.ssa,*.sub,*.txt,*.utf" }, + { MSGTR_Filter_AllFiles, "*" }, { NULL,NULL } }; int fsLastSubtitleFilterSelected = -1;

1 0

r34936 - in trunk/debian: mplayer-gui.mime mplayer.mime
by ib 21 May '12

21 May '12

Author: ib Date: Mon May 21 11:47:09 2012 New Revision: 34936 Log: Update Debian MIME type information. Modified: trunk/debian/mplayer-gui.mime trunk/debian/mplayer.mime Modified: trunk/debian/mplayer-gui.mime ============================================================================== --- trunk/debian/mplayer-gui.mime Mon May 21 11:45:29 2012 (r34935) +++ trunk/debian/mplayer-gui.mime Mon May 21 11:47:09 2012 (r34936) @@ -1,21 +1,51 @@ -application/x-ogg; /usr/bin/gmplayer %s; description="OggVorbis Audio" -application/ogg; /usr/bin/gmplayer %s; description="OggVorbis Audio" -audio/mpeg; /usr/bin/gmplayer %s; description="MPEG Audio Format" -audio/x-mpegurl; /usr/bin/gmplayer %s; description="Icecast Playlists" -audio/x-ms-wax; /usr/bin/gmplayer %s; description="Audio Format" -audio/x-ms-wma; /usr/bin/gmplayer %s; description="Audio Format" -audio/x-pls; /usr/bin/gmplayer %s; description="MP3 ShoutCast/IceCast Playlist" -audio/x-scpls; /usr/bin/gmplayer %s; description="Shoutcast Playlists" -audio/x-wav; /usr/bin/gmplayer %s; description="Waveform Microsoft Wave/RIFF" -video/mpeg; /usr/bin/gmplayer %s; description="MPEG Video Format"; test=test -n "$DISPLAY" -video/quicktime; /usr/bin/gmplayer %s; description="Apple Quicktime Video"; test=test -n "$DISPLAY" -video/x-mpeg2; /usr/bin/gmplayer %s; description="MPEG Video"; test=test -n "$DISPLAY" -video/x-mpeg; /usr/bin/gmplayer %s; description="MPEG 2 Video"; test=test -n "$DISPLAY" -video/mpeg; /usr/bin/gmplayer %s; description="MPEG 2 Video"; test=test -n "$DISPLAY" -video/x-ms-afs; /usr/bin/gmplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY" -video/x-ms-asf; /usr/bin/gmplayer %s; description="MS ASF video"; test=test -n "$DISPLAY" -video/x-msvideo; /usr/bin/gmplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY" -video/x-ms-wma; /usr/bin/gmplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY" -video/x-ms-wmv; /usr/bin/gmplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY" -video/x-ms-wmx; /usr/bin/gmplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY" -video/x-ms-wvx; /usr/bin/gmplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY" +application/mxf; /usr/bin/gmplayer %s; description="MXF video" +application/ogg; /usr/bin/gmplayer %s; description="Ogg multimedia file" +application/ram; /usr/bin/gmplayer %s; description="RealMedia Metafile" +application/vnd.rn-realmedia; /usr/bin/gmplayer %s; description="RealMedia document" +application/x-shockwave-flash; /usr/bin/gmplayer %s; description="Shockwave Flash file" +application/smil; /usr/bin/gmplayer %s; description="SMIL document" +audio/ac3; /usr/bin/gmplayer %s; description="Dolby Digital audio" +audio/x-adpcm; /usr/bin/gmplayer %s; description="PCM audio" +audio/x-aiff; /usr/bin/gmplayer %s; description="AIFF/Amiga/Mac audio" +audio/AMR; /usr/bin/gmplayer %s; description="AMR audio" +audio/AMR-WB; /usr/bin/gmplayer %s; description="AMR-WB audio" +audio/x-ape; /usr/bin/gmplayer %s; description="Monkey's audio" +audio/basic; /usr/bin/gmplayer %s; description="ULAW (Sun) audio" +audio/flac; /usr/bin/gmplayer %s; description="FLAC audio" +audio/x-flac; /usr/bin/gmplayer %s; description="FLAC audio" +audio/x-flac+ogg; /usr/bin/gmplayer %s; description="Ogg FLAC audio" +audio/x-m4b; /usr/bin/gmplayer %s; description="MPEG-4 audio book" +audio/x-matroska; /usr/bin/gmplayer %s; description="Matroska audio" +audio/mp2; /usr/bin/gmplayer %s; description="MP2 audio" +audio/mp4; /usr/bin/gmplayer %s; description="MPEG-4 audio" +audio/mpeg; /usr/bin/gmplayer %s; description="MP3 audio" +audio/x-mpegurl; /usr/bin/gmplayer %s; description="MP3 audio (streamed)" +audio/x-ms-asx; /usr/bin/gmplayer %s; description="Microsoft ASX playlist" +audio/x-ms-wma; /usr/bin/gmplayer %s; description="Windows Media audio" +audio/x-musepack; /usr/bin/gmplayer %s; description="Musepack audio" +audio/ogg; /usr/bin/gmplayer %s; description="Ogg Audio" +audio/vnd.rn-realaudio; /usr/bin/gmplayer %s; description="RealAudio document" +audio/x-scpls; /usr/bin/gmplayer %s; description="MP3 ShoutCast playlist" +audio/x-voc; /usr/bin/gmplayer %s; description="VOC audio" +audio/x-vorbis+ogg; /usr/bin/gmplayer %s; description="Ogg Vorbis audio" +audio/x-wav; /usr/bin/gmplayer %s; description="WavPack audio" +audio/x-wavpack; /usr/bin/gmplayer %s; description="WavPack audio" +video/3gpp; /usr/bin/gmplayer %s; description="3GPP multimedia file"; test=test -n "$DISPLAY" +video/3gpp2; /usr/bin/gmplayer %s; description="3GPP2 multimedia file"; test=test -n "$DISPLAY" +video/dv; /usr/bin/gmplayer %s; description="DV video"; test=test -n "$DISPLAY" +video/x-flic; /usr/bin/gmplayer %s; description="FLIC animation"; test=test -n "$DISPLAY" +video/x-flv; /usr/bin/gmplayer %s; description="Flash video"; test=test -n "$DISPLAY" +video/x-matroska; /usr/bin/gmplayer %s; description="Matroska video"; test=test -n "$DISPLAY" +video/mp2t; /usr/bin/gmplayer %s; description="MPEG-2 transport stream"; test=test -n "$DISPLAY" +video/mp4; /usr/bin/gmplayer %s; description="MPEG-4 video"; test=test -n "$DISPLAY" +video/mpeg; /usr/bin/gmplayer %s; description="MPEG video"; test=test -n "$DISPLAY" +video/x-ms-asf; /usr/bin/gmplayer %s; description="Microsoft ASF video"; test=test -n "$DISPLAY" +video/x-ms-wmv; /usr/bin/gmplayer %s; description="Windows Media video"; test=test -n "$DISPLAY" +video/x-msvideo; /usr/bin/gmplayer %s; description="AVI video"; test=test -n "$DISPLAY" +video/x-nsv; /usr/bin/gmplayer %s; description="NullSoft video"; test=test -n "$DISPLAY" +video/ogg; /usr/bin/gmplayer %s; description="Ogg Video"; test=test -n "$DISPLAY" +video/x-ogm+ogg; /usr/bin/gmplayer %s; description="OGM video"; test=test -n "$DISPLAY" +video/quicktime; /usr/bin/gmplayer %s; description="QuickTime video"; test=test -n "$DISPLAY" +video/vnd.rn-realvideo; /usr/bin/gmplayer %s; description="RealVideo document"; test=test -n "$DISPLAY" +video/x-theora+ogg; /usr/bin/gmplayer %s; description="Ogg Theora video"; test=test -n "$DISPLAY" +video/webm; /usr/bin/gmplayer %s; description="WebM video"; test=test -n "$DISPLAY" Modified: trunk/debian/mplayer.mime ============================================================================== --- trunk/debian/mplayer.mime Mon May 21 11:45:29 2012 (r34935) +++ trunk/debian/mplayer.mime Mon May 21 11:47:09 2012 (r34936) @@ -1,21 +1,51 @@ -application/x-ogg; /usr/bin/mplayer %s; description="OggVorbis Audio" -application/ogg; /usr/bin/mplayer %s; description="OggVorbis Audio" -audio/mpeg; /usr/bin/mplayer %s; description="MPEG Audio Format" -audio/x-mpegurl; /usr/bin/mplayer %s; description="Icecast Playlists" -audio/x-ms-wax; /usr/bin/mplayer %s; description="Audio Format" -audio/x-ms-wma; /usr/bin/mplayer %s; description="Audio Format" -audio/x-pls; /usr/bin/mplayer %s; description="MP3 ShoutCast/IceCast Playlist" -audio/x-scpls; /usr/bin/mplayer %s; description="Shoutcast Playlists" -audio/x-wav; /usr/bin/mplayer %s; description="Waveform Microsoft Wave/RIFF" -video/mpeg; /usr/bin/mplayer %s; description="MPEG Video Format"; test=test -n "$DISPLAY" -video/quicktime; /usr/bin/mplayer %s; description="Apple Quicktime Video"; test=test -n "$DISPLAY" -video/x-mpeg2; /usr/bin/mplayer %s; description="MPEG Video"; test=test -n "$DISPLAY" -video/x-mpeg; /usr/bin/mplayer %s; description="MPEG 2 Video"; test=test -n "$DISPLAY" -video/mpeg; /usr/bin/mplayer %s; description="MPEG 2 Video"; test=test -n "$DISPLAY" -video/x-ms-afs; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY" -video/x-ms-asf; /usr/bin/mplayer %s; description="MS ASF video"; test=test -n "$DISPLAY" -video/x-msvideo; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY" -video/x-ms-wma; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY" -video/x-ms-wmv; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY" -video/x-ms-wmx; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY" -video/x-ms-wvx; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY" +application/mxf; /usr/bin/mplayer %s; description="MXF video" +application/ogg; /usr/bin/mplayer %s; description="Ogg multimedia file" +application/ram; /usr/bin/mplayer %s; description="RealMedia Metafile" +application/vnd.rn-realmedia; /usr/bin/mplayer %s; description="RealMedia document" +application/x-shockwave-flash; /usr/bin/mplayer %s; description="Shockwave Flash file" +application/smil; /usr/bin/mplayer %s; description="SMIL document" +audio/ac3; /usr/bin/mplayer %s; description="Dolby Digital audio" +audio/x-adpcm; /usr/bin/mplayer %s; description="PCM audio" +audio/x-aiff; /usr/bin/mplayer %s; description="AIFF/Amiga/Mac audio" +audio/AMR; /usr/bin/mplayer %s; description="AMR audio" +audio/AMR-WB; /usr/bin/mplayer %s; description="AMR-WB audio" +audio/x-ape; /usr/bin/mplayer %s; description="Monkey's audio" +audio/basic; /usr/bin/mplayer %s; description="ULAW (Sun) audio" +audio/flac; /usr/bin/mplayer %s; description="FLAC audio" +audio/x-flac; /usr/bin/mplayer %s; description="FLAC audio" +audio/x-flac+ogg; /usr/bin/mplayer %s; description="Ogg FLAC audio" +audio/x-m4b; /usr/bin/mplayer %s; description="MPEG-4 audio book" +audio/x-matroska; /usr/bin/mplayer %s; description="Matroska audio" +audio/mp2; /usr/bin/mplayer %s; description="MP2 audio" +audio/mp4; /usr/bin/mplayer %s; description="MPEG-4 audio" +audio/mpeg; /usr/bin/mplayer %s; description="MP3 audio" +audio/x-mpegurl; /usr/bin/mplayer %s; description="MP3 audio (streamed)" +audio/x-ms-asx; /usr/bin/mplayer %s; description="Microsoft ASX playlist" +audio/x-ms-wma; /usr/bin/mplayer %s; description="Windows Media audio" +audio/x-musepack; /usr/bin/mplayer %s; description="Musepack audio" +audio/ogg; /usr/bin/mplayer %s; description="Ogg Audio" +audio/vnd.rn-realaudio; /usr/bin/mplayer %s; description="RealAudio document" +audio/x-scpls; /usr/bin/mplayer %s; description="MP3 ShoutCast playlist" +audio/x-voc; /usr/bin/mplayer %s; description="VOC audio" +audio/x-vorbis+ogg; /usr/bin/mplayer %s; description="Ogg Vorbis audio" +audio/x-wav; /usr/bin/mplayer %s; description="WavPack audio" +audio/x-wavpack; /usr/bin/mplayer %s; description="WavPack audio" +video/3gpp; /usr/bin/mplayer %s; description="3GPP multimedia file"; test=test -n "$DISPLAY" +video/3gpp2; /usr/bin/mplayer %s; description="3GPP2 multimedia file"; test=test -n "$DISPLAY" +video/dv; /usr/bin/mplayer %s; description="DV video"; test=test -n "$DISPLAY" +video/x-flic; /usr/bin/mplayer %s; description="FLIC animation"; test=test -n "$DISPLAY" +video/x-flv; /usr/bin/mplayer %s; description="Flash video"; test=test -n "$DISPLAY" +video/x-matroska; /usr/bin/mplayer %s; description="Matroska video"; test=test -n "$DISPLAY" +video/mp2t; /usr/bin/mplayer %s; description="MPEG-2 transport stream"; test=test -n "$DISPLAY" +video/mp4; /usr/bin/mplayer %s; description="MPEG-4 video"; test=test -n "$DISPLAY" +video/mpeg; /usr/bin/mplayer %s; description="MPEG video"; test=test -n "$DISPLAY" +video/x-ms-asf; /usr/bin/mplayer %s; description="Microsoft ASF video"; test=test -n "$DISPLAY" +video/x-ms-wmv; /usr/bin/mplayer %s; description="Windows Media video"; test=test -n "$DISPLAY" +video/x-msvideo; /usr/bin/mplayer %s; description="AVI video"; test=test -n "$DISPLAY" +video/x-nsv; /usr/bin/mplayer %s; description="NullSoft video"; test=test -n "$DISPLAY" +video/ogg; /usr/bin/mplayer %s; description="Ogg Video"; test=test -n "$DISPLAY" +video/x-ogm+ogg; /usr/bin/mplayer %s; description="OGM video"; test=test -n "$DISPLAY" +video/quicktime; /usr/bin/mplayer %s; description="QuickTime video"; test=test -n "$DISPLAY" +video/vnd.rn-realvideo; /usr/bin/mplayer %s; description="RealVideo document"; test=test -n "$DISPLAY" +video/x-theora+ogg; /usr/bin/mplayer %s; description="Ogg Theora video"; test=test -n "$DISPLAY" +video/webm; /usr/bin/mplayer %s; description="WebM video"; test=test -n "$DISPLAY"

1 0

r34935 - trunk/etc/mplayer.desktop
by ib 21 May '12

21 May '12

Author: ib Date: Mon May 21 11:45:29 2012 New Revision: 34935 Log: Update MimeType key in the desktop file. This complies with the freedesktop.org shared MIME info database. The following MIME types not registered with IANA are used: application/ram application/vnd.rn-realmedia audio/flac (in addition to audio/x-flac, see (*) below) audio/mp2 (see (**) below) audio/vnd.rn-realaudio video/vnd.rn-realvideo video/webm (*) freedesktop.org changed that from the correct, non-standard type audio/x-flac in v0.80 "for consistency with other xiph.org types not yet registered in IANA" (**) freedesktop.org introduced that in v0.22, not using the correct, non-standard type audio/x-mp2 which was added in v0.60, but only as an alias Modified: trunk/etc/mplayer.desktop Modified: trunk/etc/mplayer.desktop ============================================================================== --- trunk/etc/mplayer.desktop Mon May 21 11:42:04 2012 (r34934) +++ trunk/etc/mplayer.desktop Mon May 21 11:45:29 2012 (r34935) @@ -27,4 +27,4 @@ TryExec=gmplayer Exec=gmplayer %F Terminal=false Categories=GTK;AudioVideo;Audio;Video;Player;TV; -MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/msvideo;video/x-msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-theora;video/x-matroska;video/3gpp;application/x-flash-video; +MimeType=application/mxf;application/ogg;application/ram;application/vnd.rn-realmedia;application/x-shockwave-flash;application/smil;audio/ac3;audio/x-adpcm;audio/x-aiff;audio/AMR;audio/AMR-WB;audio/x-ape;audio/basic;audio/flac;audio/x-flac;audio/x-flac+ogg;audio/x-m4b;audio/x-matroska;audio/mp2;audio/mp4;audio/mpeg;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/ogg;audio/vnd.rn-realaudio;audio/x-scpls;audio/x-voc;audio/x-vorbis+ogg;audio/x-wav;audio/x-wavpack;video/3gpp;video/3gpp2;video/dv;video/x-flic;video/x-flv;video/x-matroska;video/mp2t;video/mp4;video/mpeg;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/ogg;video/x-ogm+ogg;video/quicktime;video/vnd.rn-realvideo;video/x-theora+ogg;video/webm;

1 0

r34934 - trunk/stream/network.c
by ib 21 May '12

21 May '12

Author: ib Date: Mon May 21 11:42:04 2012 New Revision: 34934 Log: Add MIME type application/ogg for OGG streaming. This has been registered with RFC 5334. Modified: trunk/stream/network.c Modified: trunk/stream/network.c ============================================================================== --- trunk/stream/network.c Sun May 20 19:57:39 2012 (r34933) +++ trunk/stream/network.c Mon May 21 11:42:04 2012 (r34934) @@ -102,6 +102,7 @@ const mime_struct_t mime_type_table[] = // Real Media // { "audio/x-pn-realaudio", DEMUXER_TYPE_REAL }, // OGG Streaming + { "application/ogg", DEMUXER_TYPE_OGG }, { "application/x-ogg", DEMUXER_TYPE_OGG }, // NullSoft Streaming Video { "video/nsv", DEMUXER_TYPE_NSV},

1 0

r34933 - trunk/libvo/vo_gl.c
by reimar 20 May '12

20 May '12

Author: reimar Date: Sun May 20 19:57:39 2012 New Revision: 34933 Log: SDL OpenGL: add support for swapinterval option. Modified: trunk/libvo/vo_gl.c Modified: trunk/libvo/vo_gl.c ============================================================================== --- trunk/libvo/vo_gl.c Sun May 20 19:57:08 2012 (r34932) +++ trunk/libvo/vo_gl.c Sun May 20 19:57:39 2012 (r34933) @@ -661,6 +661,10 @@ static int create_window(uint32_t d_widt #endif #ifdef CONFIG_GL_SDL if (glctx.type == GLTYPE_SDL) { +#if SDL_VERSION_ATLEAST(1, 2, 10) + // Ugly to do this here, but SDL ignores it if set later + SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, swap_interval); +#endif if (!vo_sdl_config(d_width, d_height, flags, title)) return -1; }

1 0

r34932 - trunk/libvo/sdl_common.c
by reimar 20 May '12

20 May '12

Author: reimar Date: Sun May 20 19:57:08 2012 New Revision: 34932 Log: SDL: add support for quadbuffer stereo. Modified: trunk/libvo/sdl_common.c Modified: trunk/libvo/sdl_common.c ============================================================================== --- trunk/libvo/sdl_common.c Sun May 20 19:38:18 2012 (r34931) +++ trunk/libvo/sdl_common.c Sun May 20 19:57:08 2012 (r34932) @@ -104,6 +104,7 @@ int vo_sdl_config(int w, int h, int flag vo_dwidth = vo_screenwidth; vo_dheight = vo_screenheight; } + SDL_GL_SetAttribute(SDL_GL_STEREO, !!(flags & VOFLAG_STEREO)); return 1; }

1 0

r34931 - trunk/libvo/sdl_common.c
by reimar 20 May '12

20 May '12

Author: reimar Date: Sun May 20 19:38:18 2012 New Revision: 34931 Log: Change if() condition into #if. This avoids compile issues with some older SDL versions. Modified: trunk/libvo/sdl_common.c Modified: trunk/libvo/sdl_common.c ============================================================================== --- trunk/libvo/sdl_common.c Sun May 20 18:09:56 2012 (r34930) +++ trunk/libvo/sdl_common.c Sun May 20 19:38:18 2012 (r34931) @@ -45,12 +45,13 @@ static int reinit; static void get_screensize(void) { const SDL_VideoInfo *vi; // TODO: better to use a check that gets the runtime version instead? - if (!SDL_VERSION_ATLEAST(1, 2, 10)) return; +#if SDL_VERSION_ATLEAST(1, 2, 10) // Keep user-provided settings if (vo_screenwidth > 0 || vo_screenheight > 0) return; vi = SDL_GetVideoInfo(); vo_screenwidth = vi->current_w; vo_screenheight = vi->current_h; +#endif } int vo_sdl_init(void)

1 0

r34930 - trunk/libvo/gl_common.c
by reimar 20 May '12

20 May '12

Author: reimar Date: Sun May 20 18:09:56 2012 New Revision: 34930 Log: Change some texture formats to synonyms that Mesa GLES accepts. Modified: trunk/libvo/gl_common.c Modified: trunk/libvo/gl_common.c ============================================================================== --- trunk/libvo/gl_common.c Sun May 20 17:41:41 2012 (r34929) +++ trunk/libvo/gl_common.c Sun May 20 18:09:56 2012 (r34930) @@ -271,10 +271,10 @@ int glFindFormat(uint32_t fmt, int *bpp, } *bpp = IMGFMT_IS_BGR(fmt)?IMGFMT_BGR_DEPTH(fmt):IMGFMT_RGB_DEPTH(fmt); - *gl_texfmt = 3; + *gl_texfmt = GL_RGB; switch (fmt) { case IMGFMT_RGB64NE: - *gl_texfmt = 4; + *gl_texfmt = GL_RGBA16; case IMGFMT_RGB48NE: *gl_format = GL_RGB; *gl_type = GL_UNSIGNED_SHORT; @@ -284,7 +284,7 @@ int glFindFormat(uint32_t fmt, int *bpp, *gl_type = GL_UNSIGNED_BYTE; break; case IMGFMT_RGBA: - *gl_texfmt = 4; + *gl_texfmt = GL_RGBA; *gl_format = GL_RGBA; *gl_type = GL_UNSIGNED_BYTE; break; @@ -299,7 +299,7 @@ int glFindFormat(uint32_t fmt, int *bpp, supported = 0; // no native YV12 support case IMGFMT_Y800: case IMGFMT_Y8: - *gl_texfmt = 1; + *gl_texfmt = GL_LUMINANCE; *bpp = 8; *gl_format = GL_LUMINANCE; *gl_type = GL_UNSIGNED_BYTE; @@ -352,12 +352,12 @@ int glFindFormat(uint32_t fmt, int *bpp, *gl_type = GL_UNSIGNED_BYTE; break; case IMGFMT_BGRA: - *gl_texfmt = 4; + *gl_texfmt = GL_RGBA; *gl_format = GL_BGRA; *gl_type = GL_UNSIGNED_BYTE; break; default: - *gl_texfmt = 4; + *gl_texfmt = GL_RGBA; *gl_format = GL_RGBA; *gl_type = GL_UNSIGNED_BYTE; supported = 0;

1 0

r34929 - in trunk/libvo: gl_common.c gl_common.h
by reimar 20 May '12

20 May '12

Author: reimar Date: Sun May 20 17:41:41 2012 New Revision: 34929 Log: Make a glGetError function pointer available. Modified: trunk/libvo/gl_common.c trunk/libvo/gl_common.h Modified: trunk/libvo/gl_common.c ============================================================================== --- trunk/libvo/gl_common.c Sun May 20 17:33:58 2012 (r34928) +++ trunk/libvo/gl_common.c Sun May 20 17:41:41 2012 (r34929) @@ -44,6 +44,7 @@ #include "aspect.h" #include "pnm_loader.h" +GLenum (GLAPIENTRY *mpglGetError)(void); void (GLAPIENTRY *mpglBegin)(GLenum); void (GLAPIENTRY *mpglEnd)(void); void (GLAPIENTRY *mpglViewport)(GLint, GLint, GLsizei, GLsizei); @@ -402,6 +403,7 @@ typedef struct { static const extfunc_desc_t extfuncs[] = { // these aren't extension functions but we query them anyway to allow // different "backends" with one binary + DEF_FUNC_DESC(GetError), DEF_FUNC_DESC(Begin), DEF_FUNC_DESC(End), DEF_FUNC_DESC(Viewport), Modified: trunk/libvo/gl_common.h ============================================================================== --- trunk/libvo/gl_common.h Sun May 20 17:33:58 2012 (r34928) +++ trunk/libvo/gl_common.h Sun May 20 17:41:41 2012 (r34929) @@ -446,6 +446,7 @@ typedef struct MPGLContext { int init_mpglcontext(MPGLContext *ctx, enum MPGLType type); void uninit_mpglcontext(MPGLContext *ctx); +extern GLenum (GLAPIENTRY *mpglGetError)(void); extern void (GLAPIENTRY *mpglBegin)(GLenum); extern void (GLAPIENTRY *mpglEnd)(void); extern void (GLAPIENTRY *mpglViewport)(GLint, GLint, GLsizei, GLsizei);

1 0