date:20120105

[vlc-commits] android configure script: allow custom options

2012-01-05 Thread Rafaël Carré

vlc | branch: master | Rafaël Carré  | Thu Jan  5 20:38:55 
2012 -0500| [42e415b4895b65412e00f7516a0e615ad5d23f60] | committer: Rafaël Carré

android configure script: allow custom options

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=42e415b4895b65412e00f7516a0e615ad5d23f60
---

 extras/package/android/configure.sh |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/extras/package/android/configure.sh 
b/extras/package/android/configure.sh
index a57c688..2c37c12 100755
--- a/extras/package/android/configure.sh
+++ b/extras/package/android/configure.sh
@@ -102,4 +102,5 @@ sh $VLC_SOURCEDIR/configure --host=arm-eabi-linux 
--build=x86_64-unknown-linux $
 --disable-gles1 --disable-gles2 \
 --disable-goom \
 --disable-projectm \
---enable-iomx
+--enable-iomx \
+$*

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] nsis: Chinese l10n update

2012-01-05 Thread Dean Lee

vlc | branch: master | Dean Lee  | Thu Jan  5 22:54:06 2012 
+| [04af3029f32f465b55ead02016f53d913a7be9ae] | committer: Jean-Baptiste 
Kempf

nsis: Chinese l10n update

Signed-off-by: Christophe Mutricy 
(cherry picked from commit 032350a9a5e362c5152feed1811c8df1bd4cfd40)

Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=04af3029f32f465b55ead02016f53d913a7be9ae
---

 extras/package/win32/languages/schinese.nsh |  119 ++-
 1 files changed, 63 insertions(+), 56 deletions(-)

diff --git a/extras/package/win32/languages/schinese.nsh 
b/extras/package/win32/languages/schinese.nsh
index 34cf953..1458ec5 100644
--- a/extras/package/win32/languages/schinese.nsh
+++ b/extras/package/win32/languages/schinese.nsh
@@ -1,56 +1,63 @@
-StrCpy $Name_Section01 "ý�岥 ()"
-StrCpy $Name_Section02a "��ʼ�˵ݷ�ʽ"
-StrCpy $Name_Section02b "���ݷ�ʽ"
-StrCpy $Name_Section03 "Mozilla "
-StrCpy $Name_Section04 "ActiveX "
-StrCpy $Name_Section05 "���̻ط�"
-StrCpy $Name_Section06 "�ļ͹���"
-StrCpy $Name_SectionGroupAudio "��Ƶ�ļ�"
-StrCpy $Name_SectionGroupVideo "��Ƶ�ļ�"
-StrCpy $Name_SectionGroupOther ""
-StrCpy $Name_Section07 "���ݲ˵�"
-StrCpy $Name_Section08 "ɾѡ���뻺��"
-
-StrCpy $Desc_Section01 \
-"ý�岥"
-StrCpy $Desc_Section02a \
-"��ͼ�ӵĿ�ʼ�˵��Ա�"
-StrCpy $Desc_Section02b \
-"��ͼ�ӵ��Ա�"
-StrCpy $Desc_Section03 \
-"VLC Mozilla �� Mozilla Firefox "
-StrCpy $Desc_Section04 \
-"VLC ActiveX "
-StrCpy $Desc_Section05 \
-"DVD �� CD �طŹ���ע��"
-StrCpy $Desc_Section06 \
-"�� VLC media player ��Ϊָ���ļ͵�Ĭ�ϳ���"
-StrCpy $Desc_Section07 \
-"���ӿ��ݲ˵��� ('ʹ�� VLC ' �� '���ӵ� VLC �б�')"
-StrCpy $Desc_Section08 \
-"ɾǰ��װ���µ� VLC media player ��ѡ���뻺���ļ�"
-
-StrCpy $Message_AlreadyInstalled  \
-"�Ѱ�װ VLC media player��$\n�Ƿ�ϣ���ڰ�װ \
-�Ƴ���ǰ�汾 $(^Name) ?"
-
-StrCpy $Name_Section91 "ж��"
-StrCpy $Name_Section92 "ɾѡ���뻺��"
-
-StrCpy $Desc_Section91 \
-"ж�� VLC media player "
-StrCpy $Desc_Section92 \
-"ɾ�� VLC media player ��ѡ���뻺���ļ�"
-
-StrCpy $ShellAssociation_Play ""
-StrCpy $ContextMenuEntry_PlayWith "ʹ�� VLC media player "
-StrCpy $ContextMenuEntry_AddToPlaylist "���ӵ� VLC media player �б�"
-
-StrCpy $Link_VisitWebsite " VideoLAN VLC media player ��վ"
-
-StrCpy $Name_InstTypeRecommended "�Ƽ�"
-StrCpy $Name_InstTypeMinimum "��С"
-StrCpy $Name_InstTypeFull ""
-
-StrCpy $Action_OnArrivalDVD " DVD ӰƬ"
-StrCpy $Action_OnArrivalAudioCD "��Ƶ CD"
+StrCpy $Name_Section01 "ý�岥 ()"
+StrCpy $Name_Section02a "��ʼ�˵ݷ�ʽ"
+StrCpy $Name_Section02b "���ݷ�ʽ"
+StrCpy $Name_Section03 "Mozilla "
+StrCpy $Name_Section04 "ActiveX "
+StrCpy $Name_Section05 "���̻ط�"
+StrCpy $Name_Section06 "�ļ͹���"
+StrCpy $Name_SectionGroupAudio "��Ƶ�ļ�"
+StrCpy $Name_SectionGroupVideo "��Ƶ�ļ�"
+StrCpy $Name_SectionGroupOther ""
+StrCpy $Name_Section07 "���ݲ˵�"
+StrCpy $Name_Section08 "ɾѡ���뻺��"
+
+StrCpy $Desc_Section01 \
+"ý�岥"
+StrCpy $Desc_Section02a \
+"��ͼ�ӵĿ�ʼ�˵��Ա�"
+StrCpy $Desc_Section02b \
+"��ͼ�ӵ��Ա�"
+StrCpy $Desc_Section03 \
+"VLC Mozilla �� Mozilla Firefox "
+StrCpy $Desc_Section04 \
+"VLC ActiveX "
+StrCpy $Desc_Section05 \
+"DVD �� CD �طŹ���ע��"
+StrCpy $Desc_Section06 \
+"�� VLC media player ��Ϊָ���ļ͵�Ĭ�ϳ���"
+StrCpy $Desc_Section07 \
+"���ӿ��ݲ˵��� ('ʹ�� VLC ' �� '���ӵ� VLC �б�')"
+StrCpy $Desc_Section08 \
+"ɾǰ��װ�汾�µ� VLC media player ��ѡ���뻺���ļ�"
+
+StrCpy $Message_AlreadyInstalled  \
+"�Ѿ���װ�� VLC media player��$\n�Ƿ�ϣ���ڰ�װ $(^Name) \
+֮ǰ�Ƴ��ɰ�?"
+
+StrCpy $Name_Section91 "ж��"
+StrCpy $Name_Section92 "ɾѡ���뻺��"
+
+StrCpy $Desc_Section91 \
+"ж�� VLC media player "
+StrCpy $Desc_Section92 \
+"ɾ�� VLC media player ��ѡ���뻺���ļ�"
+
+StrCpy $ShellAssociation_Play ""
+StrCpy $ContextMenuEntry_PlayWith "ʹ�� VLC media player "
+StrCpy $ContextMenuEntry_AddToPlaylist "���ӵ� VLC media player �б�"
+
+StrCpy $Link_VisitWebsite " VideoLAN VLC media player ��վ"
+
+StrCpy $Name_InstTypeRecommended "�Ƽ�"
+StrCpy $Name_InstTypeMinimum "��С"
+StrCpy $Name_InstTypeFull ""
+
+StrCpy $Action_OnArrivalDVD " DVD ӰƬ"
+StrCpy $Action_OnArrivalAudioCD "��Ƶ CD"
+StrCpy $Action_OnArrivalVCDMovie " VCD ӰƬ"
+StrCpy $Action_OnArrivalSVCDMovie " SVCD ӰƬ"
+StrCpy $Action_OnArrivalVideoFiles "��Ƶ�ļ�"
+StrCpy $Action_OnArrivalMusicFiles "��Ƶ�ļ�"
+StrCpy $Action_OnArrivalDVDAudio "��Ƶ DVD"
+
+StrCpy $License_NextText "���Ѿ��˽��Լ�ӵ�е�Ȩ���ˡ���һ��"

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] vlc.desktop: Chinese l10n update

2012-01-05 Thread Dean Lee

vlc | branch: master | Dean Lee  | Thu Jan  5 22:50:36 2012 
+| [a4b8f10df0cef6bb7c52ed361b500349afeef74a] | committer: Jean-Baptiste 
Kempf

vlc.desktop: Chinese l10n update

Signed-off-by: Christophe Mutricy 
(cherry picked from commit 4cf52d237a125684320c243e731117bf571d)

Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a4b8f10df0cef6bb7c52ed361b500349afeef74a
---

 share/vlc.desktop.in |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/share/vlc.desktop.in b/share/vlc.desktop.in
index b644067..365c964 100644
--- a/share/vlc.desktop.in
+++ b/share/vlc.desktop.in
@@ -80,6 +80,7 @@ Name[wa]=Djouweu d' media VLC
 GenericName[wa]=Djouweu d' media
 Comment[wa]=Lét, egaloye, evoye vos floûs multimedia
 Name[zh_CN]=VLC media player
+GenericName[zh_CN]=媒体播放器
 Comment[zh_CN]=为您读取、捕获或发送多媒体流
 Exec=@bindir@/vlc %U
 TryExec=@bindir@/vlc

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] l10n: Dutch update

2012-01-05 Thread Thomas De Rocker

vlc/vlc-1.2 | branch: master | Thomas De Rocker  | 
Thu Jan  5 23:52:07 2012 +| [f98ee11c24fd5cf42096ca2f820e5b56798df7d1] | 
committer: Christophe Mutricy

l10n: Dutch update

With the good file this time. Not like in d8f9df648b.

Signed-off-by: Christophe Mutricy 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=f98ee11c24fd5cf42096ca2f820e5b56798df7d1
---

 po/nl.po |  811 --
 1 files changed, 308 insertions(+), 503 deletions(-)

Diff:   
http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commitdiff;h=f98ee11c24fd5cf42096ca2f820e5b56798df7d1
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] l10n: Telugu update

2012-01-05 Thread Praveen Illa

vlc/vlc-1.2 | branch: master | Praveen Illa  | Thu Jan  5 
23:34:15 2012 +| [3d5af5e31f5ea47a4234877fe3a6b8fb04943159] | committer: 
Christophe Mutricy

l10n: Telugu update

Signed-off-by: Christophe Mutricy 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=3d5af5e31f5ea47a4234877fe3a6b8fb04943159
---

 po/te.po |  435 +-
 1 files changed, 149 insertions(+), 286 deletions(-)

Diff:   
http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commitdiff;h=3d5af5e31f5ea47a4234877fe3a6b8fb04943159
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] l10n: Simp. Chinese update

2012-01-05 Thread Dean Lee

vlc/vlc-1.2 | branch: master | Dean Lee  | Thu Jan  5 
23:39:48 2012 +| [6a08ca36507636843706aa299d6b80b5c9a0ee49] | committer: 
Christophe Mutricy

l10n: Simp. Chinese update

Signed-off-by: Christophe Mutricy 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=6a08ca36507636843706aa299d6b80b5c9a0ee49
---

 po/zh_CN.po |   37 ++---
 1 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index d4bd0bb..6809f7a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,10 +1,10 @@
 # Translation to Simplified Chinese.
-# Copyright (C) 2008-2010 the VideoLAN team
+# Copyright (C) 2008-2011 the VideoLAN team
 # This file is distributed under the same license as the VLC package.
 #
 # Yoyo , 2008.
 # Wei Mingzhi , 2009.
-# Dean Lee , 2010.
+# Dean Lee , 2010-2011.
 #
 msgid ""
 msgstr ""
@@ -2866,7 +2866,6 @@ msgid "RTSP server address"
 msgstr "RTSP 服务器地址"
 
 #: src/libvlc-module.c:925
-#, fuzzy
 msgid ""
 "This defines the address the RTSP server will listen on, along with the base "
 "path of the RTSP VOD media. Syntax is address/path. By default, the server "
@@ -2874,8 +2873,9 @@ msgid ""
 "127.0.0.1) or a host name (e.g. localhost) to restrict them to a specific "
 "network interface."
 msgstr ""
-"服务器默认会监听所有本地 IP 地址。指定 IP 地址 (如 ::1 或 127.0.0.1) 或主机"
-"名 (如 localhost) 可限制特定的网络界面。"
+"可定义 RTSP 服务器将监听的地址，以及 RTSP VOD 媒体的基准路径。语法为 地址/路"
+"径。服务器默认会监听所有本地 IP 地址。指定 IP 地址 (如 ::1 或 127.0.0.1) 或主"
+"机名 (如 localhost) 可限制特定的网络界面。"
 
 #: src/libvlc-module.c:931
 msgid "HTTP server port"
@@ -5922,7 +5922,6 @@ msgid "No video or audio device selected."
 msgstr "未选定视频或音频设备。"
 
 #: modules/access/dshow/dshow.cpp:602
-#, fuzzy
 msgid "VLC cannot open ANY capture device.Check the error log for details."
 msgstr "VLC 无法打开任何捕获设备。请检查错误日志以获取详情。"
 
@@ -15999,7 +15998,6 @@ msgid "Load subtitles file:"
 msgstr "载入字幕文件:"
 
 #: modules/gui/macosx/open.m:307
-#, fuzzy
 msgid "Override parameters"
 msgstr "覆盖参数"
 
@@ -17799,14 +17797,12 @@ msgstr ""
 "如果播放列表为空则打开一个媒体"
 
 #: modules/gui/qt4/components/controller.hpp:111
-#, fuzzy
 msgid "Previous / Backward"
-msgstr "上一个/快退"
+msgstr "上一个 / 快退"
 
 #: modules/gui/qt4/components/controller.hpp:111
-#, fuzzy
 msgid "Next / Forward"
-msgstr "下一个/快进"
+msgstr "下一个 / 快进"
 
 #: modules/gui/qt4/components/controller.hpp:112
 msgid "De-Fullscreen"
@@ -17839,19 +17835,16 @@ msgid "Step forward"
 msgstr "向前步进"
 
 #: modules/gui/qt4/components/controller.hpp:115
-#, fuzzy
 msgid "Loop / Repeat"
-msgstr "循环/重复模式"
+msgstr "循环 / 重复模式"
 
 #: modules/gui/qt4/components/controller.hpp:116
-#, fuzzy
 msgid "Open subtitles"
 msgstr "打开字幕"
 
 #: modules/gui/qt4/components/controller.hpp:116
-#, fuzzy
 msgid "Dock fullscreen controller"
-msgstr "显示全屏控制器"
+msgstr "全屏控制器停靠"
 
 #: modules/gui/qt4/components/controller.hpp:119
 msgid "Stop playback"
@@ -18499,9 +18492,8 @@ msgid "Configure Hotkeys"
 msgstr "设置热键"
 
 #: modules/gui/qt4/components/simple_preferences.cpp:948
-#, fuzzy
 msgid "File associations"
-msgstr "文件扩展名关联"
+msgstr "文件关联"
 
 #: modules/gui/qt4/components/simple_preferences.cpp:957
 #: modules/gui/qt4/dialogs_provider.hpp:42
@@ -19240,9 +19232,8 @@ msgid "Advanced Buttons"
 msgstr "高级按钮"
 
 #: modules/gui/qt4/dialogs/toolbar.cpp:442
-#, fuzzy
 msgid "Playback Buttons"
-msgstr "回放速率"
+msgstr "回放按钮"
 
 #: modules/gui/qt4/dialogs/vlm.cpp:73
 msgid "Broadcast"
@@ -19563,7 +19554,7 @@ msgstr "检查更新(&U)..."
 
 #: modules/gui/qt4/menus.cpp:803
 msgid "Sp&eed"
-msgstr ""
+msgstr "速度(&E)"
 
 #: modules/gui/qt4/menus.cpp:809
 msgid "&Faster"
@@ -26751,7 +26742,6 @@ msgid "Pause on the last frame of a video"
 msgstr "在视频最后一帧处暂停"
 
 #: modules/gui/qt4/ui/sprefs_interface.h:532
-#, fuzzy
 msgid "File extensions association"
 msgstr "文件扩展名关联"
 
@@ -29593,8 +29583,9 @@ msgstr "媒体管理器列表"
 #~ msgid "Go to Chapter"
 #~ msgstr "转到章节"
 
+#, fuzzy
 #~ msgid "Speed"
-#~ msgstr "速度"
+#~ msgstr "Speex"
 
 #~ msgid "VLC media player: Open Media Files"
 #~ msgstr "VLC 媒体播放器: 打开媒体文件"

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] l10n: Dutch update

2012-01-05 Thread Thomas De Rocker

vlc/vlc-1.2 | branch: master | Thomas De Rocker  | 
Thu Jan  5 23:24:09 2012 +| [d8f9df648beae6938868b6ad7723794b3305b448] | 
committer: Christophe Mutricy

l10n: Dutch update

Signed-off-by: Christophe Mutricy 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=d8f9df648beae6938868b6ad7723794b3305b448
---

 po/nl.po |  720 ++
 1 files changed, 444 insertions(+), 276 deletions(-)

Diff:   
http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commitdiff;h=d8f9df648beae6938868b6ad7723794b3305b448
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] l10n: Russian update

2012-01-05 Thread Alexander Law

vlc/vlc-1.2 | branch: master | Alexander Law  | Thu Jan  5 
23:27:20 2012 +| [a8d95fc6de1815af7906d67c2284015ae195da03] | committer: 
Christophe Mutricy

l10n: Russian update

Signed-off-by: Christophe Mutricy 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=a8d95fc6de1815af7906d67c2284015ae195da03
---

 po/ru.po |   50 --
 1 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/po/ru.po b/po/ru.po
index 9be82b8..44a86ad 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: vlc\n"
 "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n"
 "POT-Creation-Date: 2011-12-28 03:13+0100\n"
-"PO-Revision-Date: 2011-12-10 08:06+0300\n"
+"PO-Revision-Date: 2011-12-28 22:38+0300\n"
 "Last-Translator: Alexander LAW \n"
 "Language-Team: Russian \n"
 "Language: ru\n"
@@ -526,7 +526,7 @@ msgstr "Информация о медиа-файле"
 
 #: include/vlc_intf_strings.h:56
 msgid "&Codec Information"
-msgstr "Информация кодека"
+msgstr "Информация о кодеке"
 
 #: include/vlc_intf_strings.h:57
 msgid "&Messages"
@@ -3046,7 +3046,6 @@ msgid "RTSP server address"
 msgstr "Адрес RTSP-сервера"
 
 #: src/libvlc-module.c:925
-#, fuzzy
 msgid ""
 "This defines the address the RTSP server will listen on, along with the base "
 "path of the RTSP VOD media. Syntax is address/path. By default, the server "
@@ -3054,10 +3053,11 @@ msgid ""
 "127.0.0.1) or a host name (e.g. localhost) to restrict them to a specific "
 "network interface."
 msgstr ""
-"По умолчанию сервер будет принимать подключение по всем локальным IP-"
-"адресам. Если вы хотите ограничиться определённым сетевым интерфейсом, "
-"укажите IP-адрес (например ::1 или 127.0.0.1) или имя узла (например, "
-"localhost)."
+"Здесь определяется адрес, к которому будет привязан RTSP-сервер, а также "
+"базовый путь медиа-ресурса RTSP VOD. Синтаксис параметра: адрес/путь. По "
+"умолчанию сервер будет принимать подключение по всем локальным IP-адресам. "
+"Если вы хотите ограничиться определённым сетевым интерфейсом, укажите IP-"
+"адрес (например ::1 или 127.0.0.1) или имя узла (например, localhost)."
 
 #: src/libvlc-module.c:931
 msgid "HTTP server port"
@@ -6213,7 +6213,6 @@ msgid "No video or audio device selected."
 msgstr "Не выделено ни одного видео- или аудио-устройства."
 
 #: modules/access/dshow/dshow.cpp:602
-#, fuzzy
 msgid "VLC cannot open ANY capture device.Check the error log for details."
 msgstr ""
 "Не удаётся обнаружить какое-либо устройство захвата. В журнал ошибок "
@@ -16702,7 +16701,6 @@ msgid "Load subtitles file:"
 msgstr "Загрузить файл субтитров:"
 
 #: modules/gui/macosx/open.m:307
-#, fuzzy
 msgid "Override parameters"
 msgstr "Переопределить параметры"
 
@@ -18555,14 +18553,12 @@ msgstr ""
 "Если плейлист пуст, открыть файл"
 
 #: modules/gui/qt4/components/controller.hpp:111
-#, fuzzy
 msgid "Previous / Backward"
-msgstr "Предыдущий/Назад"
+msgstr "Предыдущий / Назад"
 
 #: modules/gui/qt4/components/controller.hpp:111
-#, fuzzy
 msgid "Next / Forward"
-msgstr "Следующий/Вперёд"
+msgstr "Следующий / Вперёд"
 
 #: modules/gui/qt4/components/controller.hpp:112
 msgid "De-Fullscreen"
@@ -18595,19 +18591,16 @@ msgid "Step forward"
 msgstr "Шаг вперёд"
 
 #: modules/gui/qt4/components/controller.hpp:115
-#, fuzzy
 msgid "Loop / Repeat"
-msgstr "Режим повтора"
+msgstr "Цикл / Повторение"
 
 #: modules/gui/qt4/components/controller.hpp:116
-#, fuzzy
 msgid "Open subtitles"
-msgstr "Открыть субтитры..."
+msgstr "Открыть субтитры"
 
 #: modules/gui/qt4/components/controller.hpp:116
-#, fuzzy
 msgid "Dock fullscreen controller"
-msgstr "Панель в полноэкранном режиме"
+msgstr "Прикрепить панель полноэкранного режима"
 
 #: modules/gui/qt4/components/controller.hpp:119
 msgid "Stop playback"
@@ -19263,7 +19256,6 @@ msgid "Configure Hotkeys"
 msgstr "Конфигурация горячих клавиш"
 
 #: modules/gui/qt4/components/simple_preferences.cpp:948
-#, fuzzy
 msgid "File associations"
 msgstr "Привязки файлов"
 
@@ -19565,9 +19557,9 @@ msgid ""
 "platform.\n"
 "\n"
 msgstr ""
-"Медиа-проигрыватель VLC - это бесплатный проигрыватель, кодировщик, вещающая "
-"программа, которая может воспроизводить: файлы, CD, DVD, сетевые источники, "
-"захватывать изображение с карт и многое другое!\n"
+"Медиа-проигрыватель VLC - это бесплатный проигрыватель, кодировщик и "
+"потоковый сервер, который может воспроизводить файлы, CD, DVD, сетевые "
+"источники, захватывать изображение и многое другое!\n"
 "VLC использует собственные кодеки и работает на большинстве популярных "
 "платформ.\n"
 "\n"
@@ -20011,9 +20003,8 @@ msgid "Advanced Buttons"
 msgstr "Дополнительные кнопки"
 
 #: modules/gui/qt4/dialogs/toolbar.cpp:442
-#, fuzzy
 msgid "Playback Buttons"
-msgstr "Скорость воспроизведения"
+msgstr "Кнопки воспроизведения"
 
 #: modules/gui/qt4/dialogs/vlm.cpp:73
 msgid "Broadcast"
@@ -20134,7 +20125,7 @@ msgstr "Открыть устройство захвата..."
 
 #: modules/gui/qt4/menus.cpp:355
 msgid "&Open (advanc

[vlc-commits] l10n: Serbian update

2012-01-05 Thread Предраг Љубеновић

vlc/vlc-1.2 | branch: master | Предраг Љубеновић  
| Thu Jan  5 23:30:41 2012 +| [74de7a204d20a565e585a65b4047b7f88a0dfbbe] | 
committer: Christophe Mutricy

l10n: Serbian update

Signed-off-by: Christophe Mutricy 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=74de7a204d20a565e585a65b4047b7f88a0dfbbe
---

 po/sr.po | 7904 +-
 1 files changed, 3145 insertions(+), 4759 deletions(-)

Diff:   
http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commitdiff;h=74de7a204d20a565e585a65b4047b7f88a0dfbbe
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] l10n: Italian update

2012-01-05 Thread Vincenzo Reale

vlc/vlc-1.2 | branch: master | Vincenzo Reale  | Thu Jan  
5 23:19:57 2012 +| [528f91982bce80c5d6da55e3d1fda84069db5e37] | committer: 
Christophe Mutricy

l10n: Italian update

Signed-off-by: Christophe Mutricy 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=528f91982bce80c5d6da55e3d1fda84069db5e37
---

 po/it.po |  547 +-
 1 files changed, 220 insertions(+), 327 deletions(-)

Diff:   
http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commitdiff;h=528f91982bce80c5d6da55e3d1fda84069db5e37
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] l10n: Japanese update

2012-01-05 Thread Fumio Nakayama

vlc/vlc-1.2 | branch: master | Fumio Nakayama  | Thu Jan  
5 23:21:10 2012 +| [46c837799157d026c2d1aa67c9d25ae7c6fad64d] | committer: 
Christophe Mutricy

l10n: Japanese update

Signed-off-by: Christophe Mutricy 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=46c837799157d026c2d1aa67c9d25ae7c6fad64d
---

 po/ja.po | 9323 ++
 1 files changed, 3327 insertions(+), 5996 deletions(-)

Diff:   
http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commitdiff;h=46c837799157d026c2d1aa67c9d25ae7c6fad64d
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] l10n: Basque update

2012-01-05 Thread Xabier Aramendi

vlc/vlc-1.2 | branch: master | Xabier Aramendi  | Thu 
Jan  5 23:16:34 2012 +| [7e5dabc343a4ed986ad27f20e7ddc15be2e062a4] | 
committer: Christophe Mutricy

l10n: Basque update

Signed-off-by: Christophe Mutricy 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=7e5dabc343a4ed986ad27f20e7ddc15be2e062a4
---

 po/eu.po | 9062 +++---
 1 files changed, 3379 insertions(+), 5683 deletions(-)

Diff:   
http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commitdiff;h=7e5dabc343a4ed986ad27f20e7ddc15be2e062a4
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] l10n: Indonesian update

2012-01-05 Thread Luqman Hakim

vlc/vlc-1.2 | branch: master | Luqman Hakim  | Thu Jan  5 
23:18:27 2012 +| [25053def116b6ece130657ca0c4d73686cf511e0] | committer: 
Christophe Mutricy

l10n: Indonesian update

Signed-off-by: Christophe Mutricy 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=25053def116b6ece130657ca0c4d73686cf511e0
---

 po/id.po | 1699 ++
 1 files changed, 938 insertions(+), 761 deletions(-)

Diff:   
http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commitdiff;h=25053def116b6ece130657ca0c4d73686cf511e0
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] nsis: Chinese l10n update

2012-01-05 Thread Dean Lee

vlc/vlc-1.2 | branch: master | Dean Lee  | Thu Jan  5 
22:54:06 2012 +| [032350a9a5e362c5152feed1811c8df1bd4cfd40] | committer: 
Christophe Mutricy

nsis: Chinese l10n update

Signed-off-by: Christophe Mutricy 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=032350a9a5e362c5152feed1811c8df1bd4cfd40
---

 extras/package/win32/languages/schinese.nsh |  119 ++-
 1 files changed, 63 insertions(+), 56 deletions(-)

diff --git a/extras/package/win32/languages/schinese.nsh 
b/extras/package/win32/languages/schinese.nsh
index 34cf953..1458ec5 100644
--- a/extras/package/win32/languages/schinese.nsh
+++ b/extras/package/win32/languages/schinese.nsh
@@ -1,56 +1,63 @@
-StrCpy $Name_Section01 "ý�岥 ()"
-StrCpy $Name_Section02a "��ʼ�˵ݷ�ʽ"
-StrCpy $Name_Section02b "���ݷ�ʽ"
-StrCpy $Name_Section03 "Mozilla "
-StrCpy $Name_Section04 "ActiveX "
-StrCpy $Name_Section05 "���̻ط�"
-StrCpy $Name_Section06 "�ļ͹���"
-StrCpy $Name_SectionGroupAudio "��Ƶ�ļ�"
-StrCpy $Name_SectionGroupVideo "��Ƶ�ļ�"
-StrCpy $Name_SectionGroupOther ""
-StrCpy $Name_Section07 "���ݲ˵�"
-StrCpy $Name_Section08 "ɾѡ���뻺��"
-
-StrCpy $Desc_Section01 \
-"ý�岥"
-StrCpy $Desc_Section02a \
-"��ͼ�ӵĿ�ʼ�˵��Ա�"
-StrCpy $Desc_Section02b \
-"��ͼ�ӵ��Ա�"
-StrCpy $Desc_Section03 \
-"VLC Mozilla �� Mozilla Firefox "
-StrCpy $Desc_Section04 \
-"VLC ActiveX "
-StrCpy $Desc_Section05 \
-"DVD �� CD �طŹ���ע��"
-StrCpy $Desc_Section06 \
-"�� VLC media player ��Ϊָ���ļ͵�Ĭ�ϳ���"
-StrCpy $Desc_Section07 \
-"���ӿ��ݲ˵��� ('ʹ�� VLC ' �� '���ӵ� VLC �б�')"
-StrCpy $Desc_Section08 \
-"ɾǰ��װ���µ� VLC media player ��ѡ���뻺���ļ�"
-
-StrCpy $Message_AlreadyInstalled  \
-"�Ѱ�װ VLC media player��$\n�Ƿ�ϣ���ڰ�װ \
-�Ƴ���ǰ�汾 $(^Name) ?"
-
-StrCpy $Name_Section91 "ж��"
-StrCpy $Name_Section92 "ɾѡ���뻺��"
-
-StrCpy $Desc_Section91 \
-"ж�� VLC media player "
-StrCpy $Desc_Section92 \
-"ɾ�� VLC media player ��ѡ���뻺���ļ�"
-
-StrCpy $ShellAssociation_Play ""
-StrCpy $ContextMenuEntry_PlayWith "ʹ�� VLC media player "
-StrCpy $ContextMenuEntry_AddToPlaylist "���ӵ� VLC media player �б�"
-
-StrCpy $Link_VisitWebsite " VideoLAN VLC media player ��վ"
-
-StrCpy $Name_InstTypeRecommended "�Ƽ�"
-StrCpy $Name_InstTypeMinimum "��С"
-StrCpy $Name_InstTypeFull ""
-
-StrCpy $Action_OnArrivalDVD " DVD ӰƬ"
-StrCpy $Action_OnArrivalAudioCD "��Ƶ CD"
+StrCpy $Name_Section01 "ý�岥 ()"
+StrCpy $Name_Section02a "��ʼ�˵ݷ�ʽ"
+StrCpy $Name_Section02b "���ݷ�ʽ"
+StrCpy $Name_Section03 "Mozilla "
+StrCpy $Name_Section04 "ActiveX "
+StrCpy $Name_Section05 "���̻ط�"
+StrCpy $Name_Section06 "�ļ͹���"
+StrCpy $Name_SectionGroupAudio "��Ƶ�ļ�"
+StrCpy $Name_SectionGroupVideo "��Ƶ�ļ�"
+StrCpy $Name_SectionGroupOther ""
+StrCpy $Name_Section07 "���ݲ˵�"
+StrCpy $Name_Section08 "ɾѡ���뻺��"
+
+StrCpy $Desc_Section01 \
+"ý�岥"
+StrCpy $Desc_Section02a \
+"��ͼ�ӵĿ�ʼ�˵��Ա�"
+StrCpy $Desc_Section02b \
+"��ͼ�ӵ��Ա�"
+StrCpy $Desc_Section03 \
+"VLC Mozilla �� Mozilla Firefox "
+StrCpy $Desc_Section04 \
+"VLC ActiveX "
+StrCpy $Desc_Section05 \
+"DVD �� CD �طŹ���ע��"
+StrCpy $Desc_Section06 \
+"�� VLC media player ��Ϊָ���ļ͵�Ĭ�ϳ���"
+StrCpy $Desc_Section07 \
+"���ӿ��ݲ˵��� ('ʹ�� VLC ' �� '���ӵ� VLC �б�')"
+StrCpy $Desc_Section08 \
+"ɾǰ��װ�汾�µ� VLC media player ��ѡ���뻺���ļ�"
+
+StrCpy $Message_AlreadyInstalled  \
+"�Ѿ���װ�� VLC media player��$\n�Ƿ�ϣ���ڰ�װ $(^Name) \
+֮ǰ�Ƴ��ɰ�?"
+
+StrCpy $Name_Section91 "ж��"
+StrCpy $Name_Section92 "ɾѡ���뻺��"
+
+StrCpy $Desc_Section91 \
+"ж�� VLC media player "
+StrCpy $Desc_Section92 \
+"ɾ�� VLC media player ��ѡ���뻺���ļ�"
+
+StrCpy $ShellAssociation_Play ""
+StrCpy $ContextMenuEntry_PlayWith "ʹ�� VLC media player "
+StrCpy $ContextMenuEntry_AddToPlaylist "���ӵ� VLC media player �б�"
+
+StrCpy $Link_VisitWebsite " VideoLAN VLC media player ��վ"
+
+StrCpy $Name_InstTypeRecommended "�Ƽ�"
+StrCpy $Name_InstTypeMinimum "��С"
+StrCpy $Name_InstTypeFull ""
+
+StrCpy $Action_OnArrivalDVD " DVD ӰƬ"
+StrCpy $Action_OnArrivalAudioCD "��Ƶ CD"
+StrCpy $Action_OnArrivalVCDMovie " VCD ӰƬ"
+StrCpy $Action_OnArrivalSVCDMovie " SVCD ӰƬ"
+StrCpy $Action_OnArrivalVideoFiles "��Ƶ�ļ�"
+StrCpy $Action_OnArrivalMusicFiles "��Ƶ�ļ�"
+StrCpy $Action_OnArrivalDVDAudio "��Ƶ DVD"
+
+StrCpy $License_NextText "���Ѿ��˽��Լ�ӵ�е�Ȩ���ˡ���һ��"

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] vlc.desktop: Chinese l10n update

2012-01-05 Thread Dean Lee

vlc/vlc-1.2 | branch: master | Dean Lee  | Thu Jan  5 
22:50:36 2012 +| [4cf52d237a125684320c243e731117bf571d] | committer: 
Christophe Mutricy

vlc.desktop: Chinese l10n update

Signed-off-by: Christophe Mutricy 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=4cf52d237a125684320c243e731117bf571d
---

 share/vlc.desktop.in |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/share/vlc.desktop.in b/share/vlc.desktop.in
index b644067..365c964 100644
--- a/share/vlc.desktop.in
+++ b/share/vlc.desktop.in
@@ -80,6 +80,7 @@ Name[wa]=Djouweu d' media VLC
 GenericName[wa]=Djouweu d' media
 Comment[wa]=Lét, egaloye, evoye vos floûs multimedia
 Name[zh_CN]=VLC media player
+GenericName[zh_CN]=媒体播放器
 Comment[zh_CN]=为您读取、捕获或发送多媒体流
 Exec=@bindir@/vlc %U
 TryExec=@bindir@/vlc

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib: openjpeg: update config.{guess,sub}

2012-01-05 Thread Rafaël Carré

vlc/vlc-1.2 | branch: master | Rafaël Carré  | Thu Jan  5 
03:41:38 2012 -0500| [42ff85eff89cec1297c64a286d3ca42efedd84d0] | committer: 
Jean-Baptiste Kempf

contrib: openjpeg: update config.{guess,sub}
(cherry picked from commit 2e554edca115a506bdb7ec07323aebf3e628fd0f)

Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=42ff85eff89cec1297c64a286d3ca42efedd84d0
---

 contrib/src/openjpeg/rules.mak |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/contrib/src/openjpeg/rules.mak b/contrib/src/openjpeg/rules.mak
index 4865b70..360b698 100644
--- a/contrib/src/openjpeg/rules.mak
+++ b/contrib/src/openjpeg/rules.mak
@@ -11,6 +11,7 @@ $(TARBALLS)/openjpeg_v$(OPENJPEG_VERSION).tgz:
 openjpeg: openjpeg_v$(OPENJPEG_VERSION).tgz .sum-openjpeg
$(UNPACK)
$(APPLY) $(SRC)/openjpeg/pkg-config.patch
+   $(UPDATE_AUTOCONFIG)
$(MOVE)
 
 .openjpeg: openjpeg

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Fixed rendering of subpictures with non 0 offset in opengl.

2012-01-05 Thread Laurent Aimar

vlc/vlc-1.2 | branch: master | Laurent Aimar  | Thu Jan  5 
22:54:34 2012 +0100| [2b7431287fc2feb637a5a5176065237707f0ee9d] | committer: 
Jean-Baptiste Kempf

Fixed rendering of subpictures with non 0 offset in opengl.

It is needed for DVD menu support.
(cherry picked from commit 446263eab3452e84c2c0f7b8725c97585b6f5720)

Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=2b7431287fc2feb637a5a5176065237707f0ee9d
---

 modules/video_output/opengl.c |6 --
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index dc6c8db..cce95bc 100644
--- a/modules/video_output/opengl.c
+++ b/modules/video_output/opengl.c
@@ -569,13 +569,15 @@ int vout_display_opengl_Prepare(vout_display_opengl_t 
*vgl,
 }
 }
 
+const int pixels_offset = r->fmt.i_y_offset * 
r->p_picture->p->i_pitch +
+  r->fmt.i_x_offset * 
r->p_picture->p->i_pixel_pitch;
 if (glr->texture) {
 glBindTexture(GL_TEXTURE_2D, glr->texture);
 /* TODO set GL_UNPACK_ALIGNMENT */
 glPixelStorei(GL_UNPACK_ROW_LENGTH, r->p_picture->p->i_pitch / 
r->p_picture->p->i_pixel_pitch);
 glTexSubImage2D(GL_TEXTURE_2D, 0,
 0, 0, glr->width, glr->height,
-glr->format, glr->type, 
r->p_picture->p->p_pixels);
+glr->format, glr->type, 
&r->p_picture->p->p_pixels[pixels_offset]);
 } else {
 glGenTextures(1, &glr->texture);
 glBindTexture(GL_TEXTURE_2D, glr->texture);
@@ -589,7 +591,7 @@ int vout_display_opengl_Prepare(vout_display_opengl_t *vgl,
 glPixelStorei(GL_UNPACK_ROW_LENGTH, r->p_picture->p->i_pitch / 
r->p_picture->p->i_pixel_pitch);
 glTexImage2D(GL_TEXTURE_2D, 0, glr->format,
  glr->width, glr->height, 0, glr->format, 
glr->type,
- r->p_picture->p->p_pixels);
+ &r->p_picture->p->p_pixels[pixels_offset]);
 }
 }
 }

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Scale subpictures without AR to fill up the whole display.

2012-01-05 Thread Laurent Aimar

vlc/vlc-1.2 | branch: master | Laurent Aimar  | Thu Jan  5 
21:50:46 2012 +0100| [835a5c0059f869ee6f92b2bfd1d07555d8c78909] | committer: 
Jean-Baptiste Kempf

Scale subpictures without AR to fill up the whole display.

It closes #5683
(cherry picked from commit 705d11a4de11c5ab20941f36f93589b855a5c3ce)

Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=835a5c0059f869ee6f92b2bfd1d07555d8c78909
---

 src/video_output/vout_subpictures.c |6 --
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/video_output/vout_subpictures.c 
b/src/video_output/vout_subpictures.c
index 70a7008..6434772 100644
--- a/src/video_output/vout_subpictures.c
+++ b/src/video_output/vout_subpictures.c
@@ -1042,8 +1042,10 @@ static subpicture_t *SpuRenderSubpictures(spu_t *spu,
 /* Compute region scale AR */
 video_format_t region_fmt = region->fmt;
 if (region_fmt.i_sar_num <= 0 || region_fmt.i_sar_den <= 0) {
-region_fmt.i_sar_num = fmt_src->i_sar_num;
-region_fmt.i_sar_den = fmt_src->i_sar_den;
+region_fmt.i_sar_num = (int64_t)fmt_dst->i_width  * 
fmt_dst->i_sar_num * subpic->i_original_picture_height;
+region_fmt.i_sar_den = (int64_t)fmt_dst->i_height * 
fmt_dst->i_sar_den * subpic->i_original_picture_width;
+vlc_ureduce(®ion_fmt.i_sar_num, ®ion_fmt.i_sar_den,
+region_fmt.i_sar_num, region_fmt.i_sar_den, 65536);
 }
 
 /* Compute scaling from original size to destination size

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Fixed rendering of subpictures with non 0 offset in direct3d.

2012-01-05 Thread Laurent Aimar

vlc/vlc-1.2 | branch: master | Laurent Aimar  | Thu Jan  5 
22:55:42 2012 +0100| [1cf70d1df4a3f785f8b3a737b92b186a06a54d00] | committer: 
Jean-Baptiste Kempf

Fixed rendering of subpictures with non 0 offset in direct3d.

It is needed for DVD menu support.
(cherry picked from commit 1772a146c2a2b9a76af44e1226765aa8368f3b0e)

Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=1cf70d1df4a3f785f8b3a737b92b186a06a54d00
---

 modules/video_output/msw/direct3d.c |   10 ++
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/video_output/msw/direct3d.c 
b/modules/video_output/msw/direct3d.c
index e55de0c..a16ab22 100644
--- a/modules/video_output/msw/direct3d.c
+++ b/modules/video_output/msw/direct3d.c
@@ -1254,10 +1254,12 @@ static void Direct3DImportSubpicture(vout_display_t *vd,
 D3DLOCKED_RECT lock;
 hr = IDirect3DTexture9_LockRect(d3dr->texture, 0, &lock, NULL, 0);
 if (SUCCEEDED(hr)) {
-uint8_t *dst_data  = lock.pBits;
-int  dst_pitch = lock.Pitch;
-uint8_t *src_data  = r->p_picture->p->p_pixels;
-int  src_pitch = r->p_picture->p->i_pitch;
+uint8_t  *dst_data   = lock.pBits;
+int   dst_pitch  = lock.Pitch;
+const int src_offset = r->fmt.i_y_offset * 
r->p_picture->p->i_pitch +
+   r->fmt.i_x_offset * 
r->p_picture->p->i_pixel_pitch;
+uint8_t  *src_data   = &r->p_picture->p->p_pixels[src_offset];
+int   src_pitch  = r->p_picture->p->i_pitch;
 for (unsigned y = 0; y < r->fmt.i_visible_height; y++) {
 int copy_pitch = __MIN(dst_pitch, 
r->p_picture->p->i_visible_pitch);
 if (d3dr->format == D3DFMT_A8B8G8R8) {

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Qt: code simplification

2012-01-05 Thread Jean-Baptiste Kempf

vlc/vlc-1.2 | branch: master | Jean-Baptiste Kempf  | Thu 
Jan  5 19:29:32 2012 +0100| [c7d8dd75c13094411a8aae03f03dcca724295479] | 
committer: Jean-Baptiste Kempf

Qt: code simplification
(cherry picked from commit 02631b2e668f3badc8c6a3349f946d146f4afcdd)

Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=c7d8dd75c13094411a8aae03f03dcca724295479
---

 modules/gui/qt4/util/input_slider.cpp |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/gui/qt4/util/input_slider.cpp 
b/modules/gui/qt4/util/input_slider.cpp
index 1798268..ecbcd25 100644
--- a/modules/gui/qt4/util/input_slider.cpp
+++ b/modules/gui/qt4/util/input_slider.cpp
@@ -387,10 +387,10 @@ void SeekSlider::paintEvent( QPaintEvent *event )
 switch ( orientation() )
 {
 case Qt::Horizontal:
-barRect.setHeight( handleSize().height() /2 );
+barRect.setHeight( height() /2 );
 break;
 case Qt::Vertical:
-barRect.setWidth( handleSize().width() /2 );
+barRect.setWidth( width() /2 );
 break;
 }
 

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Invert speex_dsp and src score capabilities

2012-01-05 Thread Jean-Baptiste Kempf

vlc/vlc-1.2 | branch: master | Jean-Baptiste Kempf  | Thu 
Jan  5 14:25:58 2012 +0100| [0473347903a41627b9a8ae8b8123d90877bfe532] | 
committer: Jean-Baptiste Kempf

Invert speex_dsp and src score capabilities

This is probably temporary, since SRC is more computationly intensive than 
speex_dsp
But this close #5781
(cherry picked from commit 5c261b04db7a7b7af65d169b7ee0700b55e72cef)

Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=0473347903a41627b9a8ae8b8123d90877bfe532
---

 modules/audio_filter/resampler/speex.c |2 +-
 modules/audio_filter/resampler/src.c   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/audio_filter/resampler/speex.c 
b/modules/audio_filter/resampler/speex.c
index 561261a..cc00e86 100644
--- a/modules/audio_filter/resampler/speex.c
+++ b/modules/audio_filter/resampler/speex.c
@@ -44,7 +44,7 @@ vlc_module_begin ()
 add_integer ("speex-resampler-quality", 4,
  QUALITY_TEXT, QUALITY_LONGTEXT, true)
 change_integer_range (0, 10)
-set_capability ("audio filter", 60)
+set_capability ("audio filter", 50)
 set_callbacks (Open, Close)
 vlc_module_end ()
 
diff --git a/modules/audio_filter/resampler/src.c 
b/modules/audio_filter/resampler/src.c
index d04e0f7..a6b8e46 100644
--- a/modules/audio_filter/resampler/src.c
+++ b/modules/audio_filter/resampler/src.c
@@ -53,7 +53,7 @@ vlc_module_begin ()
 add_integer ("src-converter-type", SRC_SINC_MEDIUM_QUALITY,
  SRC_CONV_TYPE_TEXT, SRC_CONV_TYPE_LONGTEXT, true)
 change_integer_list (conv_type_values, conv_type_texts)
-set_capability ("audio filter", 50)
+set_capability ("audio filter", 60)
 set_callbacks (Open, Close)
 vlc_module_end ()
 

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Fixed zvbi subpictures AR.

2012-01-05 Thread Laurent Aimar

vlc/vlc-1.2 | branch: master | Laurent Aimar  | Thu Jan  5 
21:52:59 2012 +0100| [a7958769099b1b5d3224ef4a2d0d32c23974d036] | committer: 
Jean-Baptiste Kempf

Fixed zvbi subpictures AR.
(cherry picked from commit 4343ec78a1fd2af33549d26c0e6bdd2702148ba8)

Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=a7958769099b1b5d3224ef4a2d0d32c23974d036
---

 modules/codec/zvbi.c |9 +++--
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/modules/codec/zvbi.c b/modules/codec/zvbi.c
index 3b02ae9..e8f8cf4 100644
--- a/modules/codec/zvbi.c
+++ b/modules/codec/zvbi.c
@@ -462,18 +462,15 @@ static subpicture_t *Subpicture( decoder_t *p_dec, 
video_format_t *p_fmt,
 }
 
 memset( &fmt, 0, sizeof(video_format_t) );
-fmt.i_chroma = b_text ? VLC_CODEC_TEXT :
-   VLC_CODEC_RGBA;
+fmt.i_chroma = b_text ? VLC_CODEC_TEXT : VLC_CODEC_RGBA;
+fmt.i_sar_num = 0;
+fmt.i_sar_den = 1;
 if( b_text )
 {
 fmt.i_bits_per_pixel = 0;
-fmt.i_sar_num = 0;
-fmt.i_sar_den = 0;
 }
 else
 {
-fmt.i_sar_num = 1;
-fmt.i_sar_den = 1;
 fmt.i_width = fmt.i_visible_width = i_columns * 12;
 fmt.i_height = fmt.i_visible_height = i_rows * 10;
 fmt.i_bits_per_pixel = 32;

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Qt: increase the bottom margin of the controller by one.

2012-01-05 Thread Jean-Baptiste Kempf

vlc/vlc-1.2 | branch: master | Jean-Baptiste Kempf  | Thu 
Jan  5 19:09:03 2012 +0100| [d3812045d010c828fe3dc910dfa6f1a456bcde9b] | 
committer: Jean-Baptiste Kempf

Qt: increase the bottom margin of the controller by one.
(cherry picked from commit 7066f3499092bf7b635db70d4f418375f8ac0104)

Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=d3812045d010c828fe3dc910dfa6f1a456bcde9b
---

 modules/gui/qt4/components/controller.cpp |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/gui/qt4/components/controller.cpp 
b/modules/gui/qt4/components/controller.cpp
index c4b0f7d..a98c241 100644
--- a/modules/gui/qt4/components/controller.cpp
+++ b/modules/gui/qt4/components/controller.cpp
@@ -648,7 +648,7 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
 #endif
 setAttribute( Qt::WA_MacBrushedMetal);
 QVBoxLayout *controlLayout = new QVBoxLayout( this );
-controlLayout->setContentsMargins( 4, 1, 0, 0 );
+controlLayout->setContentsMargins( 3, 1, 0, 1 );
 controlLayout->setSpacing( 0 );
 QHBoxLayout *controlLayout1 = new QHBoxLayout;
 controlLayout1->setSpacing( 0 ); controlLayout1->setMargin( 0 );

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib: upnp has config.* in a custom dir

2012-01-05 Thread Rafaël Carré

vlc/vlc-1.2 | branch: master | Rafaël Carré  | Thu Jan  5 
05:18:02 2012 -0500| [e87d7ea6b81cbf8df13da35aebbda89e3ba0de72] | committer: 
Jean-Baptiste Kempf

contrib: upnp has config.* in a custom dir
(cherry picked from commit 9b100a5a7ea90ce626cc68430b083040a2749c5e)

Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=e87d7ea6b81cbf8df13da35aebbda89e3ba0de72
---

 contrib/src/upnp/rules.mak |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/contrib/src/upnp/rules.mak b/contrib/src/upnp/rules.mak
index c464442..0515344 100644
--- a/contrib/src/upnp/rules.mak
+++ b/contrib/src/upnp/rules.mak
@@ -21,7 +21,7 @@ ifdef HAVE_WIN32
$(APPLY) $(SRC)/upnp/libupnp-win32.patch
$(APPLY) $(SRC)/upnp/libupnp-win64.patch
 endif
-   $(UPDATE_AUTOCONFIG)
+   $(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub 
build-aux/
$(MOVE)
 
 .upnp: upnp

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib: dvbpsi has config.* in a custom dir

2012-01-05 Thread Rafaël Carré

vlc/vlc-1.2 | branch: master | Rafaël Carré  | Thu Jan  5 
04:29:46 2012 -0500| [20cf5c9ec256222cfac8bc06ea0edb4fa516711c] | committer: 
Jean-Baptiste Kempf

contrib: dvbpsi has config.* in a custom dir
(cherry picked from commit d62d0e3f8f2cb96c755bf8e0666bf4dc248b827d)

Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=20cf5c9ec256222cfac8bc06ea0edb4fa516711c
---

 contrib/src/dvbpsi/rules.mak |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/contrib/src/dvbpsi/rules.mak b/contrib/src/dvbpsi/rules.mak
index 6b1a739..84740de 100644
--- a/contrib/src/dvbpsi/rules.mak
+++ b/contrib/src/dvbpsi/rules.mak
@@ -15,7 +15,7 @@ $(TARBALLS)/libdvbpsi-$(DVBPSI_VERSION).tar.bz2:
 
 libdvbpsi: libdvbpsi-$(DVBPSI_VERSION).tar.bz2 .sum-dvbpsi
$(UNPACK)
-   $(UPDATE_AUTOCONFIG)
+   $(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub 
.auto
$(MOVE)
 
 .dvbpsi: libdvbpsi

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib: samplerate has config.* in a custom dir

2012-01-05 Thread Rafaël Carré

vlc/vlc-1.2 | branch: master | Rafaël Carré  | Thu Jan  5 
04:57:32 2012 -0500| [34b7985aa27d22aec67339d2d1735b2d348e28fb] | committer: 
Jean-Baptiste Kempf

contrib: samplerate has config.* in a custom dir
(cherry picked from commit ccf99a62de0e94ea8f6497a9688b7e5cc22d0be3)

Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=34b7985aa27d22aec67339d2d1735b2d348e28fb
---

 contrib/src/samplerate/rules.mak |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/contrib/src/samplerate/rules.mak b/contrib/src/samplerate/rules.mak
index 2c6717f..7bdc858 100644
--- a/contrib/src/samplerate/rules.mak
+++ b/contrib/src/samplerate/rules.mak
@@ -14,7 +14,7 @@ $(TARBALLS)/libsamplerate-$(SAMPLERATE_VERSION).tar.gz:
 
 samplerate: libsamplerate-$(SAMPLERATE_VERSION).tar.gz .sum-samplerate
$(UNPACK)
-   $(UPDATE_AUTOCONFIG)
+   $(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub 
Cfg
$(MOVE)
 
 .samplerate: samplerate

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Revert "contrib: run $(RECONF) in an arbitrary list of packages"

2012-01-05 Thread Rafaël Carré

vlc/vlc-1.2 | branch: master | Rafaël Carré  | Thu Jan  5 
04:22:35 2012 -0500| [88fa831f074e870623ca7060f01704ab6f0dbd71] | committer: 
Jean-Baptiste Kempf

Revert "contrib: run $(RECONF) in an arbitrary list of packages"

This reverts commit c9a3688176a1571ab5cd9b77b6fddc3e1a110b62.

Conflicts:

contrib/src/dvbpsi/rules.mak
(cherry picked from commit aa2748bdc5f45139ec803c9597d80f1f0321f6fd)

Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=88fa831f074e870623ca7060f01704ab6f0dbd71
---

 contrib/src/dvbpsi/rules.mak |1 -
 contrib/src/flac/rules.mak   |1 -
 contrib/src/modplug/rules.mak|1 -
 contrib/src/ogg/rules.mak|2 +-
 contrib/src/samplerate/rules.mak |1 -
 contrib/src/theora/rules.mak |2 ++
 contrib/src/upnp/rules.mak   |2 ++
 contrib/src/vorbis/rules.mak |1 -
 8 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/contrib/src/dvbpsi/rules.mak b/contrib/src/dvbpsi/rules.mak
index ed9d93e..944c6c1 100644
--- a/contrib/src/dvbpsi/rules.mak
+++ b/contrib/src/dvbpsi/rules.mak
@@ -18,7 +18,6 @@ libdvbpsi: libdvbpsi-$(DVBPSI_VERSION).tar.bz2 .sum-dvbpsi
$(MOVE)
 
 .dvbpsi: libdvbpsi
-   $(RECONF)
cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
cd $< && $(MAKE) install
touch $@
diff --git a/contrib/src/flac/rules.mak b/contrib/src/flac/rules.mak
index 9b1aa0d..dbd0512 100644
--- a/contrib/src/flac/rules.mak
+++ b/contrib/src/flac/rules.mak
@@ -38,7 +38,6 @@ endif
 DEPS_flac = ogg $(DEPS_ogg)
 
 .flac: flac
-   $(RECONF) -I m4
cd $< && $(HOSTVARS) ./configure $(FLACCONF)
cd $http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib: update config.{sub,guess} in some packages

2012-01-05 Thread Rafaël Carré

vlc/vlc-1.2 | branch: master | Rafaël Carré  | Thu Jan  5 
04:25:04 2012 -0500| [31cc76ab0bedb11c978ac3ca905bf6fbd254880a] | committer: 
Jean-Baptiste Kempf

contrib: update config.{sub,guess} in some packages
(cherry picked from commit f0296b66c7ce3385042227f79f462862995c177d)

Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=31cc76ab0bedb11c978ac3ca905bf6fbd254880a
---

 contrib/src/dvbpsi/rules.mak |1 +
 contrib/src/flac/rules.mak   |1 +
 contrib/src/modplug/rules.mak|1 +
 contrib/src/ogg/rules.mak|1 +
 contrib/src/samplerate/rules.mak |1 +
 contrib/src/theora/rules.mak |1 +
 contrib/src/upnp/rules.mak   |1 +
 contrib/src/vorbis/rules.mak |1 +
 8 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/contrib/src/dvbpsi/rules.mak b/contrib/src/dvbpsi/rules.mak
index 944c6c1..6b1a739 100644
--- a/contrib/src/dvbpsi/rules.mak
+++ b/contrib/src/dvbpsi/rules.mak
@@ -15,6 +15,7 @@ $(TARBALLS)/libdvbpsi-$(DVBPSI_VERSION).tar.bz2:
 
 libdvbpsi: libdvbpsi-$(DVBPSI_VERSION).tar.bz2 .sum-dvbpsi
$(UNPACK)
+   $(UPDATE_AUTOCONFIG)
$(MOVE)
 
 .dvbpsi: libdvbpsi
diff --git a/contrib/src/flac/rules.mak b/contrib/src/flac/rules.mak
index dbd0512..457fa30 100644
--- a/contrib/src/flac/rules.mak
+++ b/contrib/src/flac/rules.mak
@@ -20,6 +20,7 @@ flac: flac-$(FLAC_VERSION).tar.gz .sum-flac
 ifdef HAVE_MACOSX
cd $(UNPACK_DIR) && sed -e 's,-dynamiclib,-dynamiclib -arch $(ARCH),' 
-i.orig configure
 endif
+   $(UPDATE_AUTOCONFIG)
$(MOVE)
 
 FLACCONF := $(HOSTCONF) \
diff --git a/contrib/src/modplug/rules.mak b/contrib/src/modplug/rules.mak
index 378fd18..a66277f 100644
--- a/contrib/src/modplug/rules.mak
+++ b/contrib/src/modplug/rules.mak
@@ -15,6 +15,7 @@ $(TARBALLS)/libmodplug-$(MODPLUG_VERSION).tar.gz:
 
 libmodplug: libmodplug-$(MODPLUG_VERSION).tar.gz .sum-modplug
$(UNPACK)
+   $(UPDATE_AUTOCONFIG)
$(MOVE)
 
 .modplug: libmodplug
diff --git a/contrib/src/ogg/rules.mak b/contrib/src/ogg/rules.mak
index 3c84f18..5d49122 100644
--- a/contrib/src/ogg/rules.mak
+++ b/contrib/src/ogg/rules.mak
@@ -22,6 +22,7 @@ libogg: libogg-$(OGG_VERSION).tar.xz .sum-ogg
 ifdef HAVE_WINCE
$(APPLY) $(SRC)/ogg/libogg-wince.patch
 endif
+   $(UPDATE_AUTOCONFIG)
$(MOVE)
 
 .ogg: libogg
diff --git a/contrib/src/samplerate/rules.mak b/contrib/src/samplerate/rules.mak
index 6766e46..2c6717f 100644
--- a/contrib/src/samplerate/rules.mak
+++ b/contrib/src/samplerate/rules.mak
@@ -14,6 +14,7 @@ $(TARBALLS)/libsamplerate-$(SAMPLERATE_VERSION).tar.gz:
 
 samplerate: libsamplerate-$(SAMPLERATE_VERSION).tar.gz .sum-samplerate
$(UNPACK)
+   $(UPDATE_AUTOCONFIG)
$(MOVE)
 
 .samplerate: samplerate
diff --git a/contrib/src/theora/rules.mak b/contrib/src/theora/rules.mak
index c3b6c1e..314f2c3 100644
--- a/contrib/src/theora/rules.mak
+++ b/contrib/src/theora/rules.mak
@@ -18,6 +18,7 @@ libtheora: libtheora-$(THEORA_VERSION).tar.xz .sum-theora
$(UNPACK)
$(APPLY) $(SRC)/theora/libtheora-includes.patch
echo 'ACLOCAL_AMFLAGS = -I m4' >> $(UNPACK_DIR)/Makefile.am
+   $(UPDATE_AUTOCONFIG)
$(MOVE)
 
 THEORACONF := $(HOSTCONF) \
diff --git a/contrib/src/upnp/rules.mak b/contrib/src/upnp/rules.mak
index 8c6184a..c464442 100644
--- a/contrib/src/upnp/rules.mak
+++ b/contrib/src/upnp/rules.mak
@@ -21,6 +21,7 @@ ifdef HAVE_WIN32
$(APPLY) $(SRC)/upnp/libupnp-win32.patch
$(APPLY) $(SRC)/upnp/libupnp-win64.patch
 endif
+   $(UPDATE_AUTOCONFIG)
$(MOVE)
 
 .upnp: upnp
diff --git a/contrib/src/vorbis/rules.mak b/contrib/src/vorbis/rules.mak
index 89df937..ec5560d 100644
--- a/contrib/src/vorbis/rules.mak
+++ b/contrib/src/vorbis/rules.mak
@@ -25,6 +25,7 @@ $(TARBALLS)/libvorbis-$(VORBIS_VERSION).tar.xz:
 
 libvorbis: libvorbis-$(VORBIS_VERSION).tar.xz .sum-vorbis
$(UNPACK)
+   $(UPDATE_AUTOCONFIG)
$(MOVE)
 
 DEPS_vorbis = ogg $(DEPS_ogg)

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] extra/tools: bump automake version

2012-01-05 Thread Rafaël Carré

vlc/vlc-1.2 | branch: master | Rafaël Carré  | Thu Jan  5 
04:02:15 2012 -0500| [68aa15d612044fd63e2f1cd26cfb72c7f2500bd9] | committer: 
Jean-Baptiste Kempf

extra/tools: bump automake version

This version's config.{guess,sub} knows about android
(cherry picked from commit e69c9040387facb214967a14b5adfa0393157ed4)

Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=68aa15d612044fd63e2f1cd26cfb72c7f2500bd9
---

 extras/tools/packages.mak |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/extras/tools/packages.mak b/extras/tools/packages.mak
index 850a851..f0becf8 100644
--- a/extras/tools/packages.mak
+++ b/extras/tools/packages.mak
@@ -13,7 +13,7 @@ LIBTOOL_URL=$(GNU)/libtool/libtool-$(LIBTOOL_VERSION).tar.gz
 AUTOCONF_VERSION=2.68
 AUTOCONF_URL=$(GNU)/autoconf/autoconf-$(AUTOCONF_VERSION).tar.bz2
 
-AUTOMAKE_VERSION=1.11.1
+AUTOMAKE_VERSION=1.11.2
 AUTOMAKE_URL=$(GNU)/automake/automake-$(AUTOMAKE_VERSION).tar.gz
 
 PKGCFG_VERSION=0.23

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] x264.c: partly revert vbv-bufsize option handling when bitrate is defined

2012-01-05 Thread Ilkka Ollakka

vlc/vlc-1.2 | branch: master | Ilkka Ollakka  | Thu Jan  5 
12:44:19 2012 +0200| [0d97f931626af999b602771f55ac8e34c3aa621f] | committer: 
Jean-Baptiste Kempf

x264.c: partly revert vbv-bufsize option handling when bitrate is defined

Previous code didn't actually behave so well with small keyints etc.
(cherry picked from commit f1e222cf3197da2a0c395b5a8eae745e470d312e)

Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=0d97f931626af999b602771f55ac8e34c3aa621f
---

 modules/codec/x264.c |   22 +-
 1 files changed, 1 insertions(+), 21 deletions(-)

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index 96cdf3d..e76b89e 100644
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -844,12 +844,7 @@ static int  Open ( vlc_object_t *p_this )
 SOUT_CFG_PREFIX "vbv-bufsize" );
 
 /* max bitrate = average bitrate -> CBR */
-i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "vbv-maxrate" );
-
-if( !i_val && p_sys->param.rc.i_rc_method == X264_RC_ABR )
-p_sys->param.rc.i_vbv_max_bitrate = p_sys->param.rc.i_bitrate;
-else if ( i_val )
-p_sys->param.rc.i_vbv_max_bitrate = i_val;
+p_sys->param.rc.i_vbv_max_bitrate = var_GetInteger( p_enc, SOUT_CFG_PREFIX 
"vbv-maxrate" );
 
 
 if( !var_GetBool( p_enc, SOUT_CFG_PREFIX "cabac" ) )
@@ -1159,21 +1154,6 @@ static int  Open ( vlc_object_t *p_this )
 if( i_val > 0 )
 p_sys->param.i_slice_max_mbs = i_val;
 
-
-/* x264 vbv-bufsize = 0 (default). if not provided set period
-   in seconds for local maximum bitrate (cache/bufsize) based
-   on average bitrate when use has told bitrate.
-   vbv-buffer size is set to bitrate * secods between keyframes */
-if( !p_sys->param.rc.i_vbv_buffer_size &&
- p_sys->param.rc.i_rc_method == X264_RC_ABR &&
- p_sys->param.i_fps_num )
-{
-p_sys->param.rc.i_vbv_buffer_size = p_sys->param.rc.i_bitrate *
-p_sys->param.i_fps_den;
-p_sys->param.rc.i_vbv_buffer_size *= p_sys->param.i_keyint_max;
-p_sys->param.rc.i_vbv_buffer_size /= p_sys->param.i_fps_num;
-}
-
 /* Check if user has given some profile (baseline,main,high) to limit
  * settings, and apply those*/
 psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "profile" );

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] x264.c: move mbtree closer to other bitrate options

2012-01-05 Thread Ilkka Ollakka

vlc/vlc-1.2 | branch: master | Ilkka Ollakka  | Thu Jan  5 
12:50:38 2012 +0200| [78227855f6696e1829182efe889c9c006a49dcdc] | committer: 
Jean-Baptiste Kempf

x264.c: move mbtree closer to other bitrate options
(cherry picked from commit 140a7dbc9bcb4cb717fd955e98d4c27abc077ffe)

Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=78227855f6696e1829182efe889c9c006a49dcdc
---

 modules/codec/x264.c |6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index e76b89e..e914c72 100644
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -847,6 +847,9 @@ static int  Open ( vlc_object_t *p_this )
 p_sys->param.rc.i_vbv_max_bitrate = var_GetInteger( p_enc, SOUT_CFG_PREFIX 
"vbv-maxrate" );
 
 
+if( !var_GetBool( p_enc, SOUT_CFG_PREFIX "mbtree" ) )
+   p_sys->param.rc.b_mb_tree = var_GetBool( p_enc, SOUT_CFG_PREFIX 
"mbtree" );
+
 if( !var_GetBool( p_enc, SOUT_CFG_PREFIX "cabac" ) )
 p_sys->param.b_cabac = var_GetBool( p_enc, SOUT_CFG_PREFIX "cabac" );
 
@@ -1218,9 +1221,6 @@ static int  Open ( vlc_object_t *p_this )
 p_sys->param.rc.b_stat_read = i_val & 2;
 }
 
-if( !var_GetBool( p_enc, SOUT_CFG_PREFIX "mbtree" ) )
-   p_sys->param.rc.b_mb_tree = var_GetBool( p_enc, SOUT_CFG_PREFIX 
"mbtree" );
-
 /* We need to initialize pthreadw32 before we open the encoder,
but only once for the whole application. Since pthreadw32
doesn't keep a refcount, do it ourselves. */

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Qt4: Fixed uninitialized variable

2012-01-05 Thread Sharad Dixit

vlc/vlc-1.2 | branch: master | Sharad Dixit  | Thu 
Jan  5 02:41:15 2012 +0100| [197e6a6355681dac6a26f23b8b4e96d25a71a7a6] | 
committer: Jean-Baptiste Kempf

Qt4: Fixed uninitialized variable

Signed-off-by: Jean-Baptiste Kempf 
(cherry picked from commit c023657699e30dbdb6681d5364e73c3114f7e27e)

Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=197e6a6355681dac6a26f23b8b4e96d25a71a7a6
---

 modules/gui/qt4/dialogs/bookmarks.cpp |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/gui/qt4/dialogs/bookmarks.cpp 
b/modules/gui/qt4/dialogs/bookmarks.cpp
index fa0ccd0..8b6ba9d 100644
--- a/modules/gui/qt4/dialogs/bookmarks.cpp
+++ b/modules/gui/qt4/dialogs/bookmarks.cpp
@@ -109,7 +109,7 @@ void BookmarksDialog::update()
 if( !p_input ) return;
 
 seekpoint_t **pp_bookmarks;
-int i_bookmarks;
+int i_bookmarks = 0;
 
 if( bookmarksList->topLevelItemCount() > 0 )
 {

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib: orc: fix android build

2012-01-05 Thread Rafaël Carré

vlc/vlc-1.2 | branch: master | Rafaël Carré  | Wed Jan  4 
20:03:59 2012 -0500| [2df61dd9c0e674c54b505449bb77d4126f839bed] | committer: 
Jean-Baptiste Kempf

contrib: orc: fix android build

google's gcc doesn't understand 'restrict'. Use __restrict__
(cherry picked from commit 702502969a8af0c166e6a6ee0af5063d8e742e28)

Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=2df61dd9c0e674c54b505449bb77d4126f839bed
---

 contrib/src/orc/android.patch |   49 +
 contrib/src/orc/rules.mak |2 +
 2 files changed, 51 insertions(+), 0 deletions(-)

diff --git a/contrib/src/orc/android.patch b/contrib/src/orc/android.patch
new file mode 100644
index 000..4c30a4e
--- /dev/null
+++ b/contrib/src/orc/android.patch
@@ -0,0 +1,49 @@
+diff -ur orc.orig/configure.ac orc/configure.ac
+--- orc.orig/configure.ac  2011-12-28 10:09:52.724224002 -0500
 orc/configure.ac   2011-12-28 10:14:06.056224002 -0500
+@@ -67,6 +67,21 @@
+)
+ AC_SUBST(LIBRT)
+ 
++HAVE_ANDROID=0
++AC_MSG_CHECKING([for an Android system])
++AC_PREPROC_IFELSE([AC_LANG_PROGRAM(
++[[#ifndef __ANDROID__
++# error Not Android
++#endif
++]],[[;]])
++],[
++HAVE_ANDROID="1"
++AC_MSG_RESULT([yes])
++],[
++AC_MSG_RESULT([no])
++])
++test "${HAVE_ANDROID}" = "1" && AC_DEFINE([ORC_RESTRICT],[__restrict__], 
[restrict keyword])
++
+ AC_CACHE_CHECK(for monotonic clocks,
+ orc_cv_monotonic_clock,AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+ #include 
+diff -ur orc.orig/orc/orcfunctions.h orc/orc/orcfunctions.h
+--- orc.orig/orc/orcfunctions.h2011-12-28 10:09:52.736224002 -0500
 orc/orc/orcfunctions.h 2011-12-28 10:15:01.216224002 -0500
+@@ -58,7 +58,7 @@
+ typedef union { orc_int64 i; double f; orc_int32 x2[2]; float x2f[2]; 
orc_int16 x4[4]; } orc_union64;
+ #endif
+ #ifndef ORC_RESTRICT
+-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
++#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && 
!defined(__ANDROID__)
+ #define ORC_RESTRICT restrict
+ #elif defined(__GNUC__) && __GNUC__ >= 4
+ #define ORC_RESTRICT __restrict__
+diff -ru orc.orig/orc/orcprogram-c.c orc/orc/orcprogram-c.c
+--- orc.orig/orc/orcprogram-c.c2011-12-28 10:18:36.624224002 -0500
 orc/orc/orcprogram-c.c 2011-12-28 10:19:12.232224002 -0500
+@@ -76,7 +76,7 @@
+ "typedef union { orc_int64 i; double f; orc_int32 x2[2]; float x2f[2]; 
orc_int16 x4[4]; } orc_union64;\n"
+ "#endif\n"
+ "#ifndef ORC_RESTRICT\n"
+-"#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L\n"
++"#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && 
!defined(__ANDROID__)\n"
+ "#define ORC_RESTRICT restrict\n"
+ "#elif defined(__GNUC__) && __GNUC__ >= 4\n"
+ "#define ORC_RESTRICT __restrict__\n"
diff --git a/contrib/src/orc/rules.mak b/contrib/src/orc/rules.mak
index 52347d7..13007e2 100644
--- a/contrib/src/orc/rules.mak
+++ b/contrib/src/orc/rules.mak
@@ -16,10 +16,12 @@ $(TARBALLS)/orc-$(ORC_VERSION).tar.gz:
 orc: orc-$(ORC_VERSION).tar.gz .sum-orc
$(UNPACK)
$(APPLY) $(SRC)/orc/orc-stdint.patch
+   $(APPLY) $(SRC)/orc/android.patch
$(UPDATE_AUTOCONFIG)
$(MOVE)
 
 .orc: orc
+   $(RECONF)
cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
cd $< && $(MAKE) install
touch $@

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib: libmpeg2 has autotool files in a custom dir

2012-01-05 Thread Rafaël Carré

vlc/vlc-1.2 | branch: master | Rafaël Carré  | Wed Jan  4 
20:08:17 2012 -0500| [652e97aa8b82350207b448231b3f21041dfb5c35] | committer: 
Jean-Baptiste Kempf

contrib: libmpeg2 has autotool files in a custom dir
(cherry picked from commit ebb59d3627b60e4f7547d0e36805c99e9d8e94c8)

Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=652e97aa8b82350207b448231b3f21041dfb5c35
---

 contrib/src/libmpeg2/rules.mak |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/contrib/src/libmpeg2/rules.mak b/contrib/src/libmpeg2/rules.mak
index 6fcf64e..2b2bf10 100644
--- a/contrib/src/libmpeg2/rules.mak
+++ b/contrib/src/libmpeg2/rules.mak
@@ -17,7 +17,7 @@ libmpeg2: libmpeg2-$(LIBMPEG2_VERSION).tar.gz .sum-libmpeg2
$(UNPACK)
$(APPLY) $(SRC)/libmpeg2/libmpeg2-arm-pld.patch
$(APPLY) $(SRC)/libmpeg2/libmpeg2-mc-neon.patch
-   $(UPDATE_AUTOCONFIG)
+   $(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub 
.auto
$(MOVE)
 
 .libmpeg2: libmpeg2

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib: gnutls: fix android build

2012-01-05 Thread Rafaël Carré

vlc/vlc-1.2 | branch: master | Rafaël Carré  | Mon Dec 26 
21:13:32 2011 -0500| [9829cd12fdc3c9cce14b2175ffc3d1f81f243799] | committer: 
Jean-Baptiste Kempf

contrib: gnutls: fix android build

gl/ builds replacements for standard headers in case the system ones don't work
but it has the reverse effect: provided headers work and built ones don't
(cherry picked from commit 937f97f2dac655071db62faf2e148b905ec41b94)

Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=9829cd12fdc3c9cce14b2175ffc3d1f81f243799
---

 contrib/src/gnutls/no-gl.patch |   20 
 contrib/src/gnutls/rules.mak   |6 ++
 2 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/contrib/src/gnutls/no-gl.patch b/contrib/src/gnutls/no-gl.patch
new file mode 100644
index 000..ac2b92a
--- /dev/null
+++ b/contrib/src/gnutls/no-gl.patch
@@ -0,0 +1,20 @@
+--- gnutls/lib/Makefile.am.orig2011-12-25 23:15:45.170377002 -0500
 gnutls/lib/Makefile.am 2011-12-25 23:15:54.094377001 -0500
+@@ -23,7 +23,7 @@
+ 
+ ACLOCAL_AMFLAGS = -I m4 -I gl/m4
+ 
+-SUBDIRS = gl po includes x509
++SUBDIRS = po includes x509
+ if ENABLE_MINITASN1
+ SUBDIRS += minitasn1
+ endif
+@@ -120,7 +120,7 @@
+ libgnutls_la_LDFLAGS = -no-undefined \
+   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ 
+-libgnutls_la_LIBADD = gl/liblgnu.la x509/libgnutls_x509.la \
++libgnutls_la_LIBADD = x509/libgnutls_x509.la \
+   $(LTLIBZ)  $(LTLIBINTL) $(LIBSOCKET) $(LTLIBDL) \
+   $(LTLIBPTHREAD)
+ 
diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index 631d9c2..1e12fc4 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -18,6 +18,9 @@ gnutls: gnutls-$(GNUTLS_VERSION).tar.bz2 .sum-gnutls
 ifdef HAVE_WIN32
$(APPLY) $(SRC)/gnutls/gnutls-win32.patch
 endif
+ifdef HAVE_ANDROID
+   $(APPLY) $(SRC)/gnutls/no-gl.patch
+endif
$(APPLY) $(SRC)/gnutls/gnutls-no-egd.patch
$(UPDATE_AUTOCONFIG)
$(MOVE)
@@ -51,6 +54,9 @@ DEPS_gnutls = nettle $(DEPS_nettle)
 endif
 
 .gnutls: gnutls
+ifdef HAVE_ANDROID
+   $(RECONF)
+endif
cd $< && $(HOSTVARS) ./configure $(GNUTLS_CONF)
cd $http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib: fix schroedinger build with android toolchain

2012-01-05 Thread Rafaël Carré

vlc/vlc-1.2 | branch: master | Rafaël Carré  | Wed Dec 28 
10:24:21 2011 -0500| [2cb5558519125f4a7243581db6dc9f7eee69a2f4] | committer: 
Jean-Baptiste Kempf

contrib: fix schroedinger build with android toolchain

google's gcc doesn't understand 'restrict'. Use __restrict__
(cherry picked from commit 9f3cdb0791751d638311fe442bae5b8cc0e46408)

Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=2cb5558519125f4a7243581db6dc9f7eee69a2f4
---

 contrib/src/schroedinger/android.patch |   11 +++
 contrib/src/schroedinger/rules.mak |1 +
 2 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/contrib/src/schroedinger/android.patch 
b/contrib/src/schroedinger/android.patch
new file mode 100644
index 000..a5be6fe
--- /dev/null
+++ b/contrib/src/schroedinger/android.patch
@@ -0,0 +1,11 @@
+--- schroedinger/schroedinger/schroorc-dist.c.orig 2011-12-28 
10:22:01.620224002 -0500
 schroedinger/schroedinger/schroorc-dist.c  2011-12-28 10:22:12.880224003 
-0500
+@@ -200,7 +200,7 @@
+ #define ORC_ISNAN(x) x)&0x7f80) == 0x7f80) && (((x)&0x007f) 
!= 0))
+ #define ORC_DENORMAL_DOUBLE(x) ((x) & 
x)&ORC_UINT64_C(0x7ff0)) == 0) ? 
ORC_UINT64_C(0xfff0) : ORC_UINT64_C(0x)))
+ #define ORC_ISNAN_DOUBLE(x) x)&ORC_UINT64_C(0x7ff0)) == 
ORC_UINT64_C(0x7ff0)) && (((x)&ORC_UINT64_C(0x000f)) != 
0))
+-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
++#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && 
!defined(__ANDROID__)
+ #define ORC_RESTRICT restrict
+ #elif defined(__GNUC__) && __GNUC__ >= 4
+ #define ORC_RESTRICT __restrict__
diff --git a/contrib/src/schroedinger/rules.mak 
b/contrib/src/schroedinger/rules.mak
index cf0b1f8..ebecc9e 100644
--- a/contrib/src/schroedinger/rules.mak
+++ b/contrib/src/schroedinger/rules.mak
@@ -16,6 +16,7 @@ $(TARBALLS)/schroedinger-$(SCHROEDINGER_VERSION).tar.gz:
 schroedinger: schroedinger-$(SCHROEDINGER_VERSION).tar.gz .sum-schroedinger
$(UNPACK)
$(APPLY) $(SRC)/schroedinger/schroedinger-notests.patch
+   $(APPLY) $(SRC)/schroedinger/android.patch
$(MOVE)
 
 DEPS_schroedinger = orc $(DEPS_orc)

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib: gme: fix android build

2012-01-05 Thread Rafaël Carré

vlc/vlc-1.2 | branch: master | Rafaël Carré  | Mon Dec 26 
21:10:39 2011 -0500| [52d45ab6b8b284af68b9cbdc04c9a08e96108586] | committer: 
Jean-Baptiste Kempf

contrib: gme: fix android build

gcc doesn't understand __restrict, use __restrict__
might break MSVC++ compatibility
(cherry picked from commit 37b428889762b86e3ab9afed4367e9a8882b87e2)

Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=52d45ab6b8b284af68b9cbdc04c9a08e96108586
---

 contrib/src/gme/android.patch |   11 +++
 contrib/src/gme/rules.mak |1 +
 2 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/contrib/src/gme/android.patch b/contrib/src/gme/android.patch
new file mode 100644
index 000..f615a7d
--- /dev/null
+++ b/contrib/src/gme/android.patch
@@ -0,0 +1,11 @@
+--- game-music-emu/gme/Blip_Buffer.h.orig  2011-12-25 22:27:15.546377001 
-0500
 game-music-emu/gme/Blip_Buffer.h   2011-12-25 22:27:37.146377002 -0500
+@@ -268,7 +268,7 @@
+ };
+ 
+   #if defined (__GNUC__) || _MSC_VER >= 1100
+-  #define BLIP_RESTRICT __restrict
++  #define BLIP_RESTRICT __restrict__
+   #else
+   #define BLIP_RESTRICT
+   #endif
diff --git a/contrib/src/gme/rules.mak b/contrib/src/gme/rules.mak
index ac5dcc5..ce633b8 100644
--- a/contrib/src/gme/rules.mak
+++ b/contrib/src/gme/rules.mak
@@ -13,6 +13,7 @@ $(TARBALLS)/game-music-emu-$(GME_VERSION).tar.bz2:
 game-music-emu: game-music-emu-$(GME_VERSION).tar.bz2 .sum-gme
$(UNPACK)
$(APPLY) $(SRC)/gme/gme-static.patch
+   $(APPLY) $(SRC)/gme/android.patch
$(MOVE)
 
 .gme: game-music-emu toolchain.cmake

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib: update config.{guess, sub} on some old packages

2012-01-05 Thread Rafaël Carré

vlc/vlc-1.2 | branch: master | Rafaël Carré  | Wed Jan  4 
19:58:19 2012 -0500| [f331039859e030266e71c603571141856eb266c9] | committer: 
Jean-Baptiste Kempf

contrib: update config.{guess,sub} on some old packages
(cherry picked from commit 6e034ff2a289e497a28e6ca4eba1b4e396aac775)

Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=f331039859e030266e71c603571141856eb266c9
---

 contrib/src/gnutls/rules.mak   |1 +
 contrib/src/jpeg/rules.mak |1 +
 contrib/src/libmpeg2/rules.mak |1 +
 contrib/src/nettle/rules.mak   |1 +
 contrib/src/orc/rules.mak  |2 +-
 contrib/src/tiff/rules.mak |1 +
 6 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index d2db2a0..631d9c2 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -19,6 +19,7 @@ ifdef HAVE_WIN32
$(APPLY) $(SRC)/gnutls/gnutls-win32.patch
 endif
$(APPLY) $(SRC)/gnutls/gnutls-no-egd.patch
+   $(UPDATE_AUTOCONFIG)
$(MOVE)
 
 GNUTLS_CONF := \
diff --git a/contrib/src/jpeg/rules.mak b/contrib/src/jpeg/rules.mak
index a5d2d5d..53d10b5 100644
--- a/contrib/src/jpeg/rules.mak
+++ b/contrib/src/jpeg/rules.mak
@@ -11,6 +11,7 @@ $(TARBALLS)/jpegsrc.v$(JPEG_VERSION).tar.gz:
 jpeg: jpegsrc.v$(JPEG_VERSION).tar.gz .sum-jpeg
$(UNPACK)
mv jpeg-$(JPEG_VERSION) jpegsrc.v$(JPEG_VERSION)
+   $(UPDATE_AUTOCONFIG)
$(MOVE)
 
 .jpeg: jpeg
diff --git a/contrib/src/libmpeg2/rules.mak b/contrib/src/libmpeg2/rules.mak
index 6fb9ec0..6fcf64e 100644
--- a/contrib/src/libmpeg2/rules.mak
+++ b/contrib/src/libmpeg2/rules.mak
@@ -17,6 +17,7 @@ libmpeg2: libmpeg2-$(LIBMPEG2_VERSION).tar.gz .sum-libmpeg2
$(UNPACK)
$(APPLY) $(SRC)/libmpeg2/libmpeg2-arm-pld.patch
$(APPLY) $(SRC)/libmpeg2/libmpeg2-mc-neon.patch
+   $(UPDATE_AUTOCONFIG)
$(MOVE)
 
 .libmpeg2: libmpeg2
diff --git a/contrib/src/nettle/rules.mak b/contrib/src/nettle/rules.mak
index d02ae14..5c71a0c 100644
--- a/contrib/src/nettle/rules.mak
+++ b/contrib/src/nettle/rules.mak
@@ -12,6 +12,7 @@ $(TARBALLS)/nettle-$(NETTLE_VERSION).tar.gz:
 
 nettle: nettle-$(NETTLE_VERSION).tar.gz .sum-nettle
$(UNPACK)
+   $(UPDATE_AUTOCONFIG)
$(MOVE)
 
 DEPS_nettle = gmp $(DEPS_gmp)
diff --git a/contrib/src/orc/rules.mak b/contrib/src/orc/rules.mak
index c326600..52347d7 100644
--- a/contrib/src/orc/rules.mak
+++ b/contrib/src/orc/rules.mak
@@ -16,10 +16,10 @@ $(TARBALLS)/orc-$(ORC_VERSION).tar.gz:
 orc: orc-$(ORC_VERSION).tar.gz .sum-orc
$(UNPACK)
$(APPLY) $(SRC)/orc/orc-stdint.patch
+   $(UPDATE_AUTOCONFIG)
$(MOVE)
 
 .orc: orc
-   #$(RECONF)
cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
cd $< && $(MAKE) install
touch $@
diff --git a/contrib/src/tiff/rules.mak b/contrib/src/tiff/rules.mak
index aba48c1..2c12e28 100644
--- a/contrib/src/tiff/rules.mak
+++ b/contrib/src/tiff/rules.mak
@@ -10,6 +10,7 @@ $(TARBALLS)/tiff-$(TIFF_VERSION).tar.gz:
 
 tiff: tiff-$(TIFF_VERSION).tar.gz .sum-tiff
$(UNPACK)
+   $(UPDATE_AUTOCONFIG)
$(MOVE)
 
 .tiff: tiff

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Fixed rendering of subpictures with non 0 offset in opengl.

2012-01-05 Thread Laurent Aimar

vlc | branch: master | Laurent Aimar  | Thu Jan  5 
22:54:34 2012 +0100| [446263eab3452e84c2c0f7b8725c97585b6f5720] | committer: 
Laurent Aimar

Fixed rendering of subpictures with non 0 offset in opengl.

It is needed for DVD menu support.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=446263eab3452e84c2c0f7b8725c97585b6f5720
---

 modules/video_output/opengl.c |6 --
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index dc6c8db..cce95bc 100644
--- a/modules/video_output/opengl.c
+++ b/modules/video_output/opengl.c
@@ -569,13 +569,15 @@ int vout_display_opengl_Prepare(vout_display_opengl_t 
*vgl,
 }
 }
 
+const int pixels_offset = r->fmt.i_y_offset * 
r->p_picture->p->i_pitch +
+  r->fmt.i_x_offset * 
r->p_picture->p->i_pixel_pitch;
 if (glr->texture) {
 glBindTexture(GL_TEXTURE_2D, glr->texture);
 /* TODO set GL_UNPACK_ALIGNMENT */
 glPixelStorei(GL_UNPACK_ROW_LENGTH, r->p_picture->p->i_pitch / 
r->p_picture->p->i_pixel_pitch);
 glTexSubImage2D(GL_TEXTURE_2D, 0,
 0, 0, glr->width, glr->height,
-glr->format, glr->type, 
r->p_picture->p->p_pixels);
+glr->format, glr->type, 
&r->p_picture->p->p_pixels[pixels_offset]);
 } else {
 glGenTextures(1, &glr->texture);
 glBindTexture(GL_TEXTURE_2D, glr->texture);
@@ -589,7 +591,7 @@ int vout_display_opengl_Prepare(vout_display_opengl_t *vgl,
 glPixelStorei(GL_UNPACK_ROW_LENGTH, r->p_picture->p->i_pitch / 
r->p_picture->p->i_pixel_pitch);
 glTexImage2D(GL_TEXTURE_2D, 0, glr->format,
  glr->width, glr->height, 0, glr->format, 
glr->type,
- r->p_picture->p->p_pixels);
+ &r->p_picture->p->p_pixels[pixels_offset]);
 }
 }
 }

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Scale subpictures without AR to fill up the whole display.

2012-01-05 Thread Laurent Aimar

vlc | branch: master | Laurent Aimar  | Thu Jan  5 
21:50:46 2012 +0100| [705d11a4de11c5ab20941f36f93589b855a5c3ce] | committer: 
Laurent Aimar

Scale subpictures without AR to fill up the whole display.

It closes #5683

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=705d11a4de11c5ab20941f36f93589b855a5c3ce
---

 src/video_output/vout_subpictures.c |6 --
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/video_output/vout_subpictures.c 
b/src/video_output/vout_subpictures.c
index 70a7008..6434772 100644
--- a/src/video_output/vout_subpictures.c
+++ b/src/video_output/vout_subpictures.c
@@ -1042,8 +1042,10 @@ static subpicture_t *SpuRenderSubpictures(spu_t *spu,
 /* Compute region scale AR */
 video_format_t region_fmt = region->fmt;
 if (region_fmt.i_sar_num <= 0 || region_fmt.i_sar_den <= 0) {
-region_fmt.i_sar_num = fmt_src->i_sar_num;
-region_fmt.i_sar_den = fmt_src->i_sar_den;
+region_fmt.i_sar_num = (int64_t)fmt_dst->i_width  * 
fmt_dst->i_sar_num * subpic->i_original_picture_height;
+region_fmt.i_sar_den = (int64_t)fmt_dst->i_height * 
fmt_dst->i_sar_den * subpic->i_original_picture_width;
+vlc_ureduce(®ion_fmt.i_sar_num, ®ion_fmt.i_sar_den,
+region_fmt.i_sar_num, region_fmt.i_sar_den, 65536);
 }
 
 /* Compute scaling from original size to destination size

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Fixed zvbi subpictures AR.

2012-01-05 Thread Laurent Aimar

vlc | branch: master | Laurent Aimar  | Thu Jan  5 
21:52:59 2012 +0100| [4343ec78a1fd2af33549d26c0e6bdd2702148ba8] | committer: 
Laurent Aimar

Fixed zvbi subpictures AR.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4343ec78a1fd2af33549d26c0e6bdd2702148ba8
---

 modules/codec/zvbi.c |9 +++--
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/modules/codec/zvbi.c b/modules/codec/zvbi.c
index 3b02ae9..e8f8cf4 100644
--- a/modules/codec/zvbi.c
+++ b/modules/codec/zvbi.c
@@ -462,18 +462,15 @@ static subpicture_t *Subpicture( decoder_t *p_dec, 
video_format_t *p_fmt,
 }
 
 memset( &fmt, 0, sizeof(video_format_t) );
-fmt.i_chroma = b_text ? VLC_CODEC_TEXT :
-   VLC_CODEC_RGBA;
+fmt.i_chroma = b_text ? VLC_CODEC_TEXT : VLC_CODEC_RGBA;
+fmt.i_sar_num = 0;
+fmt.i_sar_den = 1;
 if( b_text )
 {
 fmt.i_bits_per_pixel = 0;
-fmt.i_sar_num = 0;
-fmt.i_sar_den = 0;
 }
 else
 {
-fmt.i_sar_num = 1;
-fmt.i_sar_den = 1;
 fmt.i_width = fmt.i_visible_width = i_columns * 12;
 fmt.i_height = fmt.i_visible_height = i_rows * 10;
 fmt.i_bits_per_pixel = 32;

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Fixed rendering of subpictures with non 0 offset in direct3d.

2012-01-05 Thread Laurent Aimar

vlc | branch: master | Laurent Aimar  | Thu Jan  5 
22:55:42 2012 +0100| [1772a146c2a2b9a76af44e1226765aa8368f3b0e] | committer: 
Laurent Aimar

Fixed rendering of subpictures with non 0 offset in direct3d.

It is needed for DVD menu support.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1772a146c2a2b9a76af44e1226765aa8368f3b0e
---

 modules/video_output/msw/direct3d.c |   10 ++
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/video_output/msw/direct3d.c 
b/modules/video_output/msw/direct3d.c
index e55de0c..a16ab22 100644
--- a/modules/video_output/msw/direct3d.c
+++ b/modules/video_output/msw/direct3d.c
@@ -1254,10 +1254,12 @@ static void Direct3DImportSubpicture(vout_display_t *vd,
 D3DLOCKED_RECT lock;
 hr = IDirect3DTexture9_LockRect(d3dr->texture, 0, &lock, NULL, 0);
 if (SUCCEEDED(hr)) {
-uint8_t *dst_data  = lock.pBits;
-int  dst_pitch = lock.Pitch;
-uint8_t *src_data  = r->p_picture->p->p_pixels;
-int  src_pitch = r->p_picture->p->i_pitch;
+uint8_t  *dst_data   = lock.pBits;
+int   dst_pitch  = lock.Pitch;
+const int src_offset = r->fmt.i_y_offset * 
r->p_picture->p->i_pitch +
+   r->fmt.i_x_offset * 
r->p_picture->p->i_pixel_pitch;
+uint8_t  *src_data   = &r->p_picture->p->p_pixels[src_offset];
+int   src_pitch  = r->p_picture->p->i_pitch;
 for (unsigned y = 0; y < r->fmt.i_visible_height; y++) {
 int copy_pitch = __MIN(dst_pitch, 
r->p_picture->p->i_visible_pitch);
 if (d3dr->format == D3DFMT_A8B8G8R8) {

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Deprecated 'fullscreen' embed tag attribute in favour of 'allowfullscreen', which specifies whether the user is allowed to switch into fullscreen mode .

2012-01-05 Thread Cheng Sun

npapi-vlc | branch: master | Cheng Sun  | Thu Jan  5 
20:11:36 2012 +| [74799815317065491482137c60c892a8cadae0d0] | committer: 
Cheng Sun

Deprecated 'fullscreen' embed tag attribute in favour of 'allowfullscreen', 
which specifies whether the user is allowed to switch into fullscreen mode.

> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=74799815317065491482137c60c892a8cadae0d0
---

 npapi/vlcplugin_base.cpp |   15 +--
 npapi/vlcplugin_base.h   |1 +
 npapi/vlcplugin_gtk.cpp  |   11 +++
 npapi/vlcplugin_mac.cpp  |2 ++
 npapi/vlcplugin_win.cpp  |2 ++
 npapi/vlcplugin_xlib.cpp |2 ++
 npapi/vlcshell.cpp   |   40 +++-
 7 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/npapi/vlcplugin_base.cpp b/npapi/vlcplugin_base.cpp
index 30397c7..3e83ede 100644
--- a/npapi/vlcplugin_base.cpp
+++ b/npapi/vlcplugin_base.cpp
@@ -352,6 +352,7 @@ VlcPluginBase::VlcPluginBase( NPP instance, NPuint16_t mode 
) :
 b_stream(0),
 b_autoplay(1),
 b_toolbar(1),
+b_allowfullscreen(1),
 psz_text(NULL),
 psz_target(NULL),
 psz_bgcolor("#00"),
@@ -464,16 +465,10 @@ NPError VlcPluginBase::init(int argc, char* const argn[], 
char* const argv[])
 {
 b_autoplay = boolValue(argv[i]);
 }
-else if( !strcmp( argn[i], "fullscreen" ) )
+else if( !strcmp( argn[i], "fullscreen" )
+  || !strcmp( argn[i], "allowfullscreen" ) )
 {
-if( boolValue(argv[i]) )
-{
-ppsz_argv[ppsz_argc++] = "--fullscreen";
-}
-else
-{
-ppsz_argv[ppsz_argc++] = "--no-fullscreen";
-}
+b_allowfullscreen = boolValue(argv[i]);
 }
 else if( !strcmp( argn[i], "mute" ) )
 {
@@ -587,7 +582,7 @@ VlcPluginBase::~VlcPluginBase()
 void VlcPluginBase::setWindow(const NPWindow &window)
 {
 npwindow = window;
-};
+}
 
 /*
  * VlcPluginBase playlist replacement methods
diff --git a/npapi/vlcplugin_base.h b/npapi/vlcplugin_base.h
index 696426b..253cc69 100644
--- a/npapi/vlcplugin_base.h
+++ b/npapi/vlcplugin_base.h
@@ -224,6 +224,7 @@ public:
 int  b_stream;
 int  b_autoplay;
 int  b_toolbar;
+int  b_allowfullscreen;
 char *   psz_text;
 char *   psz_target;
 
diff --git a/npapi/vlcplugin_gtk.cpp b/npapi/vlcplugin_gtk.cpp
index 182fd16..77247ac 100644
--- a/npapi/vlcplugin_gtk.cpp
+++ b/npapi/vlcplugin_gtk.cpp
@@ -104,6 +104,7 @@ void VlcPluginGtk::do_set_fullscreen(bool yes)
 
 void VlcPluginGtk::set_fullscreen(int yes)
 {
+if (!b_allowfullscreen) return;
 if (yes == is_fullscreen) return;
 if (yes) {
 gtk_widget_show(fullscreen_win);
@@ -212,10 +213,12 @@ void VlcPluginGtk::popup_menu()
 g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(menu_handler), 
this);
 gtk_menu_shell_append(GTK_MENU_SHELL(popupmenu), menuitem);
 /* set fullscreen */
-menuitem = gtk_image_menu_item_new_from_stock(
-GTK_STOCK_FULLSCREEN, NULL);
-g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(menu_handler), 
this);
-gtk_menu_shell_append(GTK_MENU_SHELL(popupmenu), menuitem);
+if (b_allowfullscreen) {
+menuitem = gtk_image_menu_item_new_from_stock(
+GTK_STOCK_FULLSCREEN, NULL);
+g_signal_connect(G_OBJECT(menuitem), "activate", 
G_CALLBACK(menu_handler), this);
+gtk_menu_shell_append(GTK_MENU_SHELL(popupmenu), menuitem);
+}
 /* toolbar */
 menuitem = gtk_check_menu_item_new_with_label(
 VLCPLUGINGTK_MENU_TOOLBAR);
diff --git a/npapi/vlcplugin_mac.cpp b/npapi/vlcplugin_mac.cpp
index b37b68b..1c79d39 100644
--- a/npapi/vlcplugin_mac.cpp
+++ b/npapi/vlcplugin_mac.cpp
@@ -42,12 +42,14 @@ void VlcPluginMac::set_player_window()
 
 void VlcPluginMac::toggle_fullscreen()
 {
+if (!b_allowfullscreen) return;
 if (playlist_isplaying())
 libvlc_toggle_fullscreen(libvlc_media_player);
 }
 
 void VlcPluginMac::set_fullscreen(int yes)
 {
+if (!b_allowfullscreen) return;
 if (playlist_isplaying())
 libvlc_set_fullscreen(libvlc_media_player, yes);
 }
diff --git a/npapi/vlcplugin_win.cpp b/npapi/vlcplugin_win.cpp
index d500551..726e87a 100644
--- a/npapi/vlcplugin_win.cpp
+++ b/npapi/vlcplugin_win.cpp
@@ -98,11 +98,13 @@ VlcPluginWin::~VlcPluginWin()
 
 void VlcPluginWin::toggle_fullscreen()
 {
+if (!b_allowfullscreen) return;
 _WindowsManager.ToggleFullScreen();
 }
 
 void VlcPluginWin::set_fullscreen(int yes)
 {
+if (!b_allowfullscreen) return;
 if(yes){
 _WindowsManager.StartFullScreen();
 }
diff --git a/npapi/vlcplugin_xlib.cpp b/npapi/vlcplugin_xlib.cpp
index b556220..835fcaa 100644
--- a/npapi/vlcplugin_xlib.cpp
+

[vlc-commits] Remove unused progid embed tag attribute

2012-01-05 Thread Cheng Sun

npapi-vlc | branch: master | Cheng Sun  | Thu Jan  5 
18:39:37 2012 +| [c2f75bf4d2cf2acee1f1aad9cd1169d82607a702] | committer: 
Cheng Sun

Remove unused progid embed tag attribute

> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=c2f75bf4d2cf2acee1f1aad9cd1169d82607a702
---

 npapi/vlcplugin_base.cpp |7 ---
 1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/npapi/vlcplugin_base.cpp b/npapi/vlcplugin_base.cpp
index d7ec060..30397c7 100644
--- a/npapi/vlcplugin_base.cpp
+++ b/npapi/vlcplugin_base.cpp
@@ -442,8 +442,6 @@ NPError VlcPluginBase::init(int argc, char* const argn[], 
char* const argv[])
 ppsz_argv[ppsz_argc++] = "--no-video-title-show";
 ppsz_argv[ppsz_argc++] = "--no-xlib";
 
-const char *progid = NULL;
-
 /* parse plugin arguments */
 for( int i = 0; (i < argc) && (ppsz_argc < 32); i++ )
 {
@@ -496,11 +494,6 @@ NPError VlcPluginBase::init(int argc, char* const argn[], 
char* const argv[])
 ppsz_argv[ppsz_argc++] = "--no-loop";
 }
 }
-else if( !strcmp( argn[i], "version")
-  || !strcmp( argn[i], "progid") )
-{
-progid = argv[i];
-}
 else if( !strcmp( argn[i], "toolbar" ) )
 {
 b_toolbar = boolValue(argv[i]);

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Fix constness of psz_bgcolor. This fixes a compiler warning.

2012-01-05 Thread Cheng Sun

npapi-vlc | branch: master | Cheng Sun  | Thu Jan  5 
20:16:55 2012 +| [95115dab2bd1ad16f20d3ed11f9091bccd577ca1] | committer: 
Cheng Sun

Fix constness of psz_bgcolor. This fixes a compiler warning.

> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=95115dab2bd1ad16f20d3ed11f9091bccd577ca1
---

 npapi/vlcplugin_base.cpp |2 +-
 npapi/vlcplugin_base.h   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/npapi/vlcplugin_base.cpp b/npapi/vlcplugin_base.cpp
index 3e83ede..5447fc6 100644
--- a/npapi/vlcplugin_base.cpp
+++ b/npapi/vlcplugin_base.cpp
@@ -495,7 +495,7 @@ NPError VlcPluginBase::init(int argc, char* const argn[], 
char* const argv[])
 }
 else if( !strcmp( argn[i], "bgcolor" ) )
 {
-psz_bgcolor = argv[i];
+psz_bgcolor = strdup( argv[i] );
 }
 }
 
diff --git a/npapi/vlcplugin_base.h b/npapi/vlcplugin_base.h
index 253cc69..d26e253 100644
--- a/npapi/vlcplugin_base.h
+++ b/npapi/vlcplugin_base.h
@@ -321,7 +321,7 @@ protected:
 
 /* display settings */
 NPWindow  npwindow;
-char*psz_bgcolor;
+const char *psz_bgcolor;
 
 static void eventAsync(void *);
 

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Qt: code simplification

2012-01-05 Thread Jean-Baptiste Kempf

vlc | branch: master | Jean-Baptiste Kempf  | Thu Jan  5 
19:29:32 2012 +0100| [02631b2e668f3badc8c6a3349f946d146f4afcdd] | committer: 
Jean-Baptiste Kempf

Qt: code simplification

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=02631b2e668f3badc8c6a3349f946d146f4afcdd
---

 modules/gui/qt4/util/input_slider.cpp |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/gui/qt4/util/input_slider.cpp 
b/modules/gui/qt4/util/input_slider.cpp
index 1798268..ecbcd25 100644
--- a/modules/gui/qt4/util/input_slider.cpp
+++ b/modules/gui/qt4/util/input_slider.cpp
@@ -387,10 +387,10 @@ void SeekSlider::paintEvent( QPaintEvent *event )
 switch ( orientation() )
 {
 case Qt::Horizontal:
-barRect.setHeight( handleSize().height() /2 );
+barRect.setHeight( height() /2 );
 break;
 case Qt::Vertical:
-barRect.setWidth( handleSize().width() /2 );
+barRect.setWidth( width() /2 );
 break;
 }
 

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Qt: increase the bottom margin of the controller by one.

2012-01-05 Thread Jean-Baptiste Kempf

vlc | branch: master | Jean-Baptiste Kempf  | Thu Jan  5 
19:09:03 2012 +0100| [7066f3499092bf7b635db70d4f418375f8ac0104] | committer: 
Jean-Baptiste Kempf

Qt: increase the bottom margin of the controller by one.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7066f3499092bf7b635db70d4f418375f8ac0104
---

 modules/gui/qt4/components/controller.cpp |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/gui/qt4/components/controller.cpp 
b/modules/gui/qt4/components/controller.cpp
index e61a1b5..0b4c5c8 100644
--- a/modules/gui/qt4/components/controller.cpp
+++ b/modules/gui/qt4/components/controller.cpp
@@ -648,7 +648,7 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
 #endif
 setAttribute( Qt::WA_MacBrushedMetal);
 QVBoxLayout *controlLayout = new QVBoxLayout( this );
-controlLayout->setContentsMargins( 4, 1, 0, 0 );
+controlLayout->setContentsMargins( 3, 1, 0, 1 );
 controlLayout->setSpacing( 0 );
 QHBoxLayout *controlLayout1 = new QHBoxLayout;
 controlLayout1->setSpacing( 0 ); controlLayout1->setMargin( 0 );

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] dtv/linux: use vlc open wrappers

2012-01-05 Thread Rafaël Carré

vlc | branch: master | Rafaël Carré  | Wed Jan  4 19:20:38 
2012 -0500| [374fc686a22063c060d36582f0e90ab1a57ab33e] | committer: Rémi 
Denis-Courmont

dtv/linux: use vlc open wrappers

Those handle the absence of O_CLOEXEC correctly

Signed-off-by: Rémi Denis-Courmont 

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=374fc686a22063c060d36582f0e90ab1a57ab33e
---

 modules/access/dtv/linux.c |5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/access/dtv/linux.c b/modules/access/dtv/linux.c
index 4bbef3f..d66fe98 100644
--- a/modules/access/dtv/linux.c
+++ b/modules/access/dtv/linux.c
@@ -25,6 +25,7 @@
 #endif
 
 #include 
+#include 
 
 #include 
 #include 
@@ -58,7 +59,7 @@ static int dvb_open_adapter (uint8_t adapter)
 char dir[20];
 
 snprintf (dir, sizeof (dir), "/dev/dvb/adapter%"PRIu8, adapter);
-return open (dir, O_SEARCH|O_DIRECTORY|O_CLOEXEC);
+return vlc_open (dir, O_SEARCH|O_DIRECTORY);
 }
 
 /** Opens the DVB device node of the specified type */
@@ -68,7 +69,7 @@ static int dvb_open_node (int dir, const char *type, unsigned 
dev, int flags)
 char path[strlen (type) + 4];
 
 snprintf (path, sizeof (path), "%s%"PRIu8, type, dev);
-fd = openat (dir, path, flags|O_CLOEXEC);
+fd = vlc_openat (dir, path, flags);
 if (fd != -1)
 fcntl (fd, F_SETFL, fcntl (fd, F_GETFL) | O_NONBLOCK);
 return fd;

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Cleanup lua script escape sequences for lua 5.2.

2012-01-05 Thread Kelly Anderson

vlc | branch: master | Kelly Anderson  | Thu Jan  5 
06:23:35 2012 -0700| [a957114421fd2e875432e5fde0448ffc1ae60cfd] | committer: 
Rémi Denis-Courmont

Cleanup lua script escape sequences for lua 5.2.

Converting \ to %, since 5.2 no longer accepts \.

Signed-off-by: Rémi Denis-Courmont 

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a957114421fd2e875432e5fde0448ffc1ae60cfd
---

 share/lua/extensions/imdb.lua|2 +-
 share/lua/playlist/appletrailers.lua |6 +++---
 share/lua/playlist/extreme.lua   |   10 +-
 share/lua/playlist/katsomo.lua   |2 +-
 share/lua/playlist/mpora.lua |4 ++--
 share/lua/playlist/pinkbike.lua  |4 ++--
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/share/lua/extensions/imdb.lua b/share/lua/extensions/imdb.lua
index 829948d..194a219 100644
--- a/share/lua/extensions/imdb.lua
+++ b/share/lua/extensions/imdb.lua
@@ -237,7 +237,7 @@ function parse_resultspage(data)
 if not link then break end -- this would not be normal 
behavior...
 _, pos, thistitle = string.find(table, "]*>([^<]+)", pos)
 if not thistitle then break end -- this would not be normal 
behavior...
-local _, _, year = string.find(table, "\((%d+)\)", pos)
+local _, _, year = string.find(table, "%((%d+)%)", pos)
 -- Add this title to the list
 count = count + 1
 local _, _, imdbID = string.find(link, "/([^/]+)/$")
diff --git a/share/lua/playlist/appletrailers.lua 
b/share/lua/playlist/appletrailers.lua
index 8bd4bea..4d0f5e7 100644
--- a/share/lua/playlist/appletrailers.lua
+++ b/share/lua/playlist/appletrailers.lua
@@ -67,7 +67,7 @@ function parse()
 description = find( line, "h%d.->(.-)http://.*\.jpg)" ') do
+for img in string.gmatch(line, 'http://.*%.jpg)" ') do
 art_url = img
 end
 for i,value in pairs(playlist) do
@@ -76,8 +76,8 @@ function parse()
 else break end
 end
 end
-if string.match( line, "class=\"hd\".-\.mov") then
-for urlline,resolution in string.gmatch(line, 
"class=\"hd\".-href=\"(.-.mov)\".-(%d+.-p)") do
+if string.match( line, 'class="hd".-%.mov') then
+for urlline,resolution in string.gmatch(line, 
'class="hd".-href="(.-%.mov)".-(%d+.-p)') do
 urlline = string.gsub( urlline, "_"..resolution, 
"_h"..resolution )
 table.insert( playlist, { path = urlline,
   name = description ..  '(' .. 
resolution .. ')',
diff --git a/share/lua/playlist/extreme.lua b/share/lua/playlist/extreme.lua
index 6fd7251..f5949ce 100644
--- a/share/lua/playlist/extreme.lua
+++ b/share/lua/playlist/extreme.lua
@@ -34,14 +34,14 @@ end
 -- Probe function.
 function probe()
 return vlc.access == "http"
-and string.match( vlc.path, "extreme.com/." )
-or string.match( vlc.path, "freecaster.tv/." )
-or string.match( vlc.path, "player.extreme.com/info/.")
+and string.match( vlc.path, "extreme%.com/." )
+or string.match( vlc.path, "freecaster%.tv/." )
+or string.match( vlc.path, "player%.extreme%.com/info/.")
 end
 
 -- Parse function.
 function parse()
-if (string.match( vlc.path, "extreme\.com/." ) or string.match( vlc.path, 
"freecaster\.tv/." )) and not string.match( vlc.path, 
"player.extreme.com/info/") then
+if (string.match( vlc.path, "extreme%.com/." ) or string.match( vlc.path, 
"freecaster%.tv/." )) and not string.match( vlc.path, 
"player%.extreme%.com/info/") then
 while true do
 line = vlc.readline()
 if not line then break end
@@ -54,7 +54,7 @@ function parse()
 return { { path = "http://player.extreme.com/info/"; .. vid; name = 
"extreme.com video"; } }
 end
 
-if string.match( vlc.path, "player.extreme.com/info/." ) then
+if string.match( vlc.path, "player%.extreme%.com/info/." ) then
 prefres = get_prefres()
 gostraight = true
 while true do
diff --git a/share/lua/playlist/katsomo.lua b/share/lua/playlist/katsomo.lua
index bf461c7..6965e4e 100644
--- a/share/lua/playlist/katsomo.lua
+++ b/share/lua/playlist/katsomo.lua
@@ -57,7 +57,7 @@ function parse()
 then
 arturl = "http://www.katsomo.fi"..find( line, " src=\"(.-)\" alt=" 
)
 end
-for treeid,name in string.gmatch( line, 
"/\?treeId=(%d+)\">([^<]+)([^<]+)http://www.katsomo.fi/?treeId="..treeid
diff --git a/share/lua/playlist/mpora.lua b/share/lua/playlist/mpora.lua
index cfee5d0..d48c1e6 100644
--- a/share/lua/playlist/mpora.lua
+++ b/share/lua/playlist/mpora.lua
@@ -23,7 +23,7 @@
 -- Probe function.
 function probe()
 return vlc.access == "http"
-and string.match( vlc.path, "video.mpora.com/watch/" )
+and string.match( vlc.path, "video%.mpora%.com/watch/" )
 end

[vlc-commits] Consolidate lua includes in vlc.h

2012-01-05 Thread Kelly Anderson

vlc | branch: master | Kelly Anderson  | Thu Jan  5 
06:23:36 2012 -0700| [c0f44d25b394418bbbe0f436c67b5872f7f44f5d] | committer: 
Rémi Denis-Courmont

Consolidate lua includes in vlc.h

So lua 5.2 compatibility declarations can be made in one place.

Signed-off-by: Rémi Denis-Courmont 

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c0f44d25b394418bbbe0f436c67b5872f7f44f5d
---

 modules/lua/intf.c   |4 
 modules/lua/libs/acl.c   |3 ---
 modules/lua/libs/configuration.c |3 ---
 modules/lua/libs/dialog.c|3 ---
 modules/lua/libs/equalizer.c |3 ---
 modules/lua/libs/gettext.c   |4 
 modules/lua/libs/httpd.c |4 
 modules/lua/libs/input.c |4 +---
 modules/lua/libs/input.h |2 ++
 modules/lua/libs/messages.c  |4 
 modules/lua/libs/misc.c  |4 
 modules/lua/libs/net.c   |3 ---
 modules/lua/libs/objects.c   |3 ---
 modules/lua/libs/osd.c   |3 ---
 modules/lua/libs/playlist.c  |3 ---
 modules/lua/libs/sd.c|4 
 modules/lua/libs/stream.c|3 ---
 modules/lua/libs/strings.c   |3 ---
 modules/lua/libs/variables.c |4 
 modules/lua/libs/video.c |3 ---
 modules/lua/libs/vlm.c   |3 ---
 modules/lua/libs/volume.c|4 
 modules/lua/libs/xml.c   |3 ---
 modules/lua/vlc.c|4 
 modules/lua/vlc.h|6 ++
 25 files changed, 9 insertions(+), 78 deletions(-)

Diff:   
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=c0f44d25b394418bbbe0f436c67b5872f7f44f5d
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Invert speex_dsp and src score capabilities

2012-01-05 Thread Jean-Baptiste Kempf

vlc | branch: master | Jean-Baptiste Kempf  | Thu Jan  5 
14:25:58 2012 +0100| [5c261b04db7a7b7af65d169b7ee0700b55e72cef] | committer: 
Jean-Baptiste Kempf

Invert speex_dsp and src score capabilities

This is probably temporary, since SRC is more computationly intensive than 
speex_dsp
But this close #5781

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5c261b04db7a7b7af65d169b7ee0700b55e72cef
---

 modules/audio_filter/resampler/speex.c |2 +-
 modules/audio_filter/resampler/src.c   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/audio_filter/resampler/speex.c 
b/modules/audio_filter/resampler/speex.c
index 561261a..cc00e86 100644
--- a/modules/audio_filter/resampler/speex.c
+++ b/modules/audio_filter/resampler/speex.c
@@ -44,7 +44,7 @@ vlc_module_begin ()
 add_integer ("speex-resampler-quality", 4,
  QUALITY_TEXT, QUALITY_LONGTEXT, true)
 change_integer_range (0, 10)
-set_capability ("audio filter", 60)
+set_capability ("audio filter", 50)
 set_callbacks (Open, Close)
 vlc_module_end ()
 
diff --git a/modules/audio_filter/resampler/src.c 
b/modules/audio_filter/resampler/src.c
index d04e0f7..a6b8e46 100644
--- a/modules/audio_filter/resampler/src.c
+++ b/modules/audio_filter/resampler/src.c
@@ -53,7 +53,7 @@ vlc_module_begin ()
 add_integer ("src-converter-type", SRC_SINC_MEDIUM_QUALITY,
  SRC_CONV_TYPE_TEXT, SRC_CONV_TYPE_LONGTEXT, true)
 change_integer_list (conv_type_values, conv_type_texts)
-set_capability ("audio filter", 50)
+set_capability ("audio filter", 60)
 set_callbacks (Open, Close)
 vlc_module_end ()
 

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] x264.c: add support for 8 and 10 bit encoding for all high10, high442 and high444 profiles

2012-01-05 Thread Ilkka Ollakka

vlc | branch: master | Ilkka Ollakka  | Thu Jan  5 17:09:20 
2012 +0200| [8d9fe141ea0b4834122d5b122340c3e571c6654b] | committer: Ilkka 
Ollakka

x264.c: add support for 8 and 10 bit encoding for all high10, high442 and 
high444 profiles

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8d9fe141ea0b4834122d5b122340c3e571c6654b
---

 modules/codec/x264.c |   17 +++--
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index dd51245..11f290a 100644
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -770,20 +770,25 @@ static int  Open ( vlc_object_t *p_this )
 char *psz_profile = var_GetString( p_enc, SOUT_CFG_PREFIX "profile" );
 if( psz_profile )
 {
+#if X264_CSP_HIGH_DEPTH
+int mask = x264_bit_depth > 8 ? X264_CSP_HIGH_DEPTH : 0;
+#else
+int mask = 0;
+#endif
 if( !strcmp( psz_profile, "high10" ) )
 {
-p_enc->fmt_in.i_codec = VLC_CODEC_I420_10L;
-p_sys->i_colorspace = X264_CSP_I420 | X264_CSP_HIGH_DEPTH;
+p_enc->fmt_in.i_codec = mask ? VLC_CODEC_I420_10L : VLC_CODEC_I420;
+p_sys->i_colorspace = X264_CSP_I420 | mask;
 }
 if( !strcmp( psz_profile, "high422" ) )
 {
-p_enc->fmt_in.i_codec = VLC_CODEC_I422;
-p_sys->i_colorspace = X264_CSP_I422;
+p_enc->fmt_in.i_codec = mask ? VLC_CODEC_I422_10L : VLC_CODEC_I422;
+p_sys->i_colorspace = X264_CSP_I422 | mask;
 }
 if( !strcmp( psz_profile, "high444" ) )
 {
-p_enc->fmt_in.i_codec = VLC_CODEC_I444;
-p_sys->i_colorspace = X264_CSP_I444;
+p_enc->fmt_in.i_codec = mask ? VLC_CODEC_I444_10L : VLC_CODEC_I444;
+p_sys->i_colorspace = X264_CSP_I444 | mask;
 }
 }
 free( psz_profile );

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] x264.c: remote pts/dts scaling as it isn't needed nowadays

2012-01-05 Thread Ilkka Ollakka

vlc | branch: master | Ilkka Ollakka  | Thu Jan  5 15:50:10 
2012 +0200| [0c56024b539fcb79e8c2f77e216a2d7105f003f5] | committer: Ilkka 
Ollakka

x264.c: remote pts/dts scaling as it isn't needed nowadays

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0c56024b539fcb79e8c2f77e216a2d7105f003f5
---

 modules/codec/x264.c |   10 ++
 1 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index 1479a53..dd51245 100644
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -1331,12 +1331,6 @@ static block_t *Encode( encoder_t *p_enc, picture_t 
*p_pict )
 #endif
 if( likely(p_pict) ) {
pic.i_pts = p_pict->date;
-   /* scale pts starting from 0 as libx264 seems to return dts values
-  assume that
-*/
-   if( unlikely( p_sys->i_initial_delay == 0 ) )
-   p_sys->i_initial_delay = p_pict->date;
-   pic.i_pts -= p_sys->i_initial_delay;
pic.img.i_csp = p_sys->i_colorspace;
pic.img.i_plane = p_pict->i_planes;
for( i = 0; i < p_pict->i_planes; i++ )
@@ -1390,8 +1384,8 @@ static block_t *Encode( encoder_t *p_enc, picture_t 
*p_pict )
 p_enc->fmt_in.video.i_frame_rate;
 
 /* scale pts-values back*/
-p_block->i_pts = pic.i_pts + p_sys->i_initial_delay;
-p_block->i_dts = pic.i_dts + p_sys->i_initial_delay;
+p_block->i_pts = pic.i_pts;
+p_block->i_dts = pic.i_dts;
 
 return p_block;
 }

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] x264.c: support high422,high444 and high10 encoding

2012-01-05 Thread Ilkka Ollakka

vlc | branch: master | Ilkka Ollakka  | Thu Jan  5 15:49:40 
2012 +0200| [b7003c73eebe84afbb6f99bff10b3400502933da] | committer: Ilkka 
Ollakka

x264.c: support high422,high444 and high10 encoding

10-bit encoding requires libx264 compiled with 10-bit support that doesn't
work with normal 8-bit input.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b7003c73eebe84afbb6f99bff10b3400502933da
---

 NEWS |2 ++
 modules/codec/x264.c |   32 
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index d46a90b..63fef27 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 Changes between 1.2.x and 1.3.0-git:
 
 
+Encoders:
+ * high10,high422 and high444 encoding support in h264
 
 
 Changes between 1.1.12 and 1.2.0:
diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index 60cd3b2..1479a53 100644
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -727,6 +727,7 @@ struct encoder_sys_t
 
 char*psz_stat_name;
 int i_sei_size;
+uint32_t i_colorspace;
 uint8_t *p_sei;
 };
 
@@ -760,13 +761,35 @@ static int  Open ( vlc_object_t *p_this )
 
 p_enc->fmt_out.i_cat = VIDEO_ES;
 p_enc->fmt_out.i_codec = VLC_CODEC_H264;
+p_enc->p_sys = p_sys = malloc( sizeof( encoder_sys_t ) );
+if( !p_sys )
+return VLC_ENOMEM;
+
 p_enc->fmt_in.i_codec = VLC_CODEC_I420;
+p_sys->i_colorspace = X264_CSP_I420;
+char *psz_profile = var_GetString( p_enc, SOUT_CFG_PREFIX "profile" );
+if( psz_profile )
+{
+if( !strcmp( psz_profile, "high10" ) )
+{
+p_enc->fmt_in.i_codec = VLC_CODEC_I420_10L;
+p_sys->i_colorspace = X264_CSP_I420 | X264_CSP_HIGH_DEPTH;
+}
+if( !strcmp( psz_profile, "high422" ) )
+{
+p_enc->fmt_in.i_codec = VLC_CODEC_I422;
+p_sys->i_colorspace = X264_CSP_I422;
+}
+if( !strcmp( psz_profile, "high444" ) )
+{
+p_enc->fmt_in.i_codec = VLC_CODEC_I444;
+p_sys->i_colorspace = X264_CSP_I444;
+}
+}
+free( psz_profile );
 
 p_enc->pf_encode_video = Encode;
 p_enc->pf_encode_audio = NULL;
-p_enc->p_sys = p_sys = malloc( sizeof( encoder_sys_t ) );
-if( !p_sys )
-return VLC_ENOMEM;
 p_sys->i_initial_delay = 0;
 p_sys->psz_stat_name = NULL;
 p_sys->i_sei_size = 0;
@@ -783,6 +806,7 @@ static int  Open ( vlc_object_t *p_this )
 x264_param_default_preset( &p_sys->param, psz_preset, psz_tune );
 free( psz_preset );
 free( psz_tune );
+p_sys->param.i_csp = p_sys->i_colorspace;
 p_sys->param.i_width  = p_enc->fmt_in.video.i_width;
 p_sys->param.i_height = p_enc->fmt_in.video.i_height;
 
@@ -1313,7 +1337,7 @@ static block_t *Encode( encoder_t *p_enc, picture_t 
*p_pict )
if( unlikely( p_sys->i_initial_delay == 0 ) )
p_sys->i_initial_delay = p_pict->date;
pic.i_pts -= p_sys->i_initial_delay;
-   pic.img.i_csp = X264_CSP_I420;
+   pic.img.i_csp = p_sys->i_colorspace;
pic.img.i_plane = p_pict->i_planes;
for( i = 0; i < p_pict->i_planes; i++ )
{

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib: upnp has config.* in a custom dir

2012-01-05 Thread Rafaël Carré

vlc | branch: master | Rafaël Carré  | Thu Jan  5 05:18:02 
2012 -0500| [9b100a5a7ea90ce626cc68430b083040a2749c5e] | committer: Rafaël Carré

contrib: upnp has config.* in a custom dir

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9b100a5a7ea90ce626cc68430b083040a2749c5e
---

 contrib/src/upnp/rules.mak |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/contrib/src/upnp/rules.mak b/contrib/src/upnp/rules.mak
index c464442..0515344 100644
--- a/contrib/src/upnp/rules.mak
+++ b/contrib/src/upnp/rules.mak
@@ -21,7 +21,7 @@ ifdef HAVE_WIN32
$(APPLY) $(SRC)/upnp/libupnp-win32.patch
$(APPLY) $(SRC)/upnp/libupnp-win64.patch
 endif
-   $(UPDATE_AUTOCONFIG)
+   $(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub 
build-aux/
$(MOVE)
 
 .upnp: upnp

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib: samplerate has config.* in a custom dir

2012-01-05 Thread Rafaël Carré

vlc | branch: master | Rafaël Carré  | Thu Jan  5 04:57:32 
2012 -0500| [ccf99a62de0e94ea8f6497a9688b7e5cc22d0be3] | committer: Rafaël Carré

contrib: samplerate has config.* in a custom dir

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ccf99a62de0e94ea8f6497a9688b7e5cc22d0be3
---

 contrib/src/samplerate/rules.mak |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/contrib/src/samplerate/rules.mak b/contrib/src/samplerate/rules.mak
index 2c6717f..7bdc858 100644
--- a/contrib/src/samplerate/rules.mak
+++ b/contrib/src/samplerate/rules.mak
@@ -14,7 +14,7 @@ $(TARBALLS)/libsamplerate-$(SAMPLERATE_VERSION).tar.gz:
 
 samplerate: libsamplerate-$(SAMPLERATE_VERSION).tar.gz .sum-samplerate
$(UNPACK)
-   $(UPDATE_AUTOCONFIG)
+   $(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub 
Cfg
$(MOVE)
 
 .samplerate: samplerate

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib: dvbpsi has config.* in a custom dir

2012-01-05 Thread Rafaël Carré

vlc | branch: master | Rafaël Carré  | Thu Jan  5 04:29:46 
2012 -0500| [d62d0e3f8f2cb96c755bf8e0666bf4dc248b827d] | committer: Rafaël Carré

contrib: dvbpsi has config.* in a custom dir

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d62d0e3f8f2cb96c755bf8e0666bf4dc248b827d
---

 contrib/src/dvbpsi/rules.mak |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/contrib/src/dvbpsi/rules.mak b/contrib/src/dvbpsi/rules.mak
index 6b1a739..84740de 100644
--- a/contrib/src/dvbpsi/rules.mak
+++ b/contrib/src/dvbpsi/rules.mak
@@ -15,7 +15,7 @@ $(TARBALLS)/libdvbpsi-$(DVBPSI_VERSION).tar.bz2:
 
 libdvbpsi: libdvbpsi-$(DVBPSI_VERSION).tar.bz2 .sum-dvbpsi
$(UNPACK)
-   $(UPDATE_AUTOCONFIG)
+   $(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub 
.auto
$(MOVE)
 
 .dvbpsi: libdvbpsi

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib: update config.{sub,guess} in some packages

2012-01-05 Thread Rafaël Carré

vlc | branch: master | Rafaël Carré  | Thu Jan  5 04:25:04 
2012 -0500| [f0296b66c7ce3385042227f79f462862995c177d] | committer: Rafaël Carré

contrib: update config.{sub,guess} in some packages

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f0296b66c7ce3385042227f79f462862995c177d
---

 contrib/src/dvbpsi/rules.mak |1 +
 contrib/src/flac/rules.mak   |1 +
 contrib/src/modplug/rules.mak|1 +
 contrib/src/ogg/rules.mak|1 +
 contrib/src/samplerate/rules.mak |1 +
 contrib/src/theora/rules.mak |1 +
 contrib/src/upnp/rules.mak   |1 +
 contrib/src/vorbis/rules.mak |1 +
 8 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/contrib/src/dvbpsi/rules.mak b/contrib/src/dvbpsi/rules.mak
index 944c6c1..6b1a739 100644
--- a/contrib/src/dvbpsi/rules.mak
+++ b/contrib/src/dvbpsi/rules.mak
@@ -15,6 +15,7 @@ $(TARBALLS)/libdvbpsi-$(DVBPSI_VERSION).tar.bz2:
 
 libdvbpsi: libdvbpsi-$(DVBPSI_VERSION).tar.bz2 .sum-dvbpsi
$(UNPACK)
+   $(UPDATE_AUTOCONFIG)
$(MOVE)
 
 .dvbpsi: libdvbpsi
diff --git a/contrib/src/flac/rules.mak b/contrib/src/flac/rules.mak
index dbd0512..457fa30 100644
--- a/contrib/src/flac/rules.mak
+++ b/contrib/src/flac/rules.mak
@@ -20,6 +20,7 @@ flac: flac-$(FLAC_VERSION).tar.gz .sum-flac
 ifdef HAVE_MACOSX
cd $(UNPACK_DIR) && sed -e 's,-dynamiclib,-dynamiclib -arch $(ARCH),' 
-i.orig configure
 endif
+   $(UPDATE_AUTOCONFIG)
$(MOVE)
 
 FLACCONF := $(HOSTCONF) \
diff --git a/contrib/src/modplug/rules.mak b/contrib/src/modplug/rules.mak
index 378fd18..a66277f 100644
--- a/contrib/src/modplug/rules.mak
+++ b/contrib/src/modplug/rules.mak
@@ -15,6 +15,7 @@ $(TARBALLS)/libmodplug-$(MODPLUG_VERSION).tar.gz:
 
 libmodplug: libmodplug-$(MODPLUG_VERSION).tar.gz .sum-modplug
$(UNPACK)
+   $(UPDATE_AUTOCONFIG)
$(MOVE)
 
 .modplug: libmodplug
diff --git a/contrib/src/ogg/rules.mak b/contrib/src/ogg/rules.mak
index 3c84f18..5d49122 100644
--- a/contrib/src/ogg/rules.mak
+++ b/contrib/src/ogg/rules.mak
@@ -22,6 +22,7 @@ libogg: libogg-$(OGG_VERSION).tar.xz .sum-ogg
 ifdef HAVE_WINCE
$(APPLY) $(SRC)/ogg/libogg-wince.patch
 endif
+   $(UPDATE_AUTOCONFIG)
$(MOVE)
 
 .ogg: libogg
diff --git a/contrib/src/samplerate/rules.mak b/contrib/src/samplerate/rules.mak
index 6766e46..2c6717f 100644
--- a/contrib/src/samplerate/rules.mak
+++ b/contrib/src/samplerate/rules.mak
@@ -14,6 +14,7 @@ $(TARBALLS)/libsamplerate-$(SAMPLERATE_VERSION).tar.gz:
 
 samplerate: libsamplerate-$(SAMPLERATE_VERSION).tar.gz .sum-samplerate
$(UNPACK)
+   $(UPDATE_AUTOCONFIG)
$(MOVE)
 
 .samplerate: samplerate
diff --git a/contrib/src/theora/rules.mak b/contrib/src/theora/rules.mak
index c3b6c1e..314f2c3 100644
--- a/contrib/src/theora/rules.mak
+++ b/contrib/src/theora/rules.mak
@@ -18,6 +18,7 @@ libtheora: libtheora-$(THEORA_VERSION).tar.xz .sum-theora
$(UNPACK)
$(APPLY) $(SRC)/theora/libtheora-includes.patch
echo 'ACLOCAL_AMFLAGS = -I m4' >> $(UNPACK_DIR)/Makefile.am
+   $(UPDATE_AUTOCONFIG)
$(MOVE)
 
 THEORACONF := $(HOSTCONF) \
diff --git a/contrib/src/upnp/rules.mak b/contrib/src/upnp/rules.mak
index 8c6184a..c464442 100644
--- a/contrib/src/upnp/rules.mak
+++ b/contrib/src/upnp/rules.mak
@@ -21,6 +21,7 @@ ifdef HAVE_WIN32
$(APPLY) $(SRC)/upnp/libupnp-win32.patch
$(APPLY) $(SRC)/upnp/libupnp-win64.patch
 endif
+   $(UPDATE_AUTOCONFIG)
$(MOVE)
 
 .upnp: upnp
diff --git a/contrib/src/vorbis/rules.mak b/contrib/src/vorbis/rules.mak
index 89df937..ec5560d 100644
--- a/contrib/src/vorbis/rules.mak
+++ b/contrib/src/vorbis/rules.mak
@@ -25,6 +25,7 @@ $(TARBALLS)/libvorbis-$(VORBIS_VERSION).tar.xz:
 
 libvorbis: libvorbis-$(VORBIS_VERSION).tar.xz .sum-vorbis
$(UNPACK)
+   $(UPDATE_AUTOCONFIG)
$(MOVE)
 
 DEPS_vorbis = ogg $(DEPS_ogg)

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Revert "contrib: run $(RECONF) in an arbitrary list of packages"

2012-01-05 Thread Rafaël Carré

vlc | branch: master | Rafaël Carré  | Thu Jan  5 04:22:35 
2012 -0500| [aa2748bdc5f45139ec803c9597d80f1f0321f6fd] | committer: Rafaël Carré

Revert "contrib: run $(RECONF) in an arbitrary list of packages"

This reverts commit c9a3688176a1571ab5cd9b77b6fddc3e1a110b62.

Conflicts:

contrib/src/dvbpsi/rules.mak

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=aa2748bdc5f45139ec803c9597d80f1f0321f6fd
---

 contrib/src/dvbpsi/rules.mak |1 -
 contrib/src/flac/rules.mak   |1 -
 contrib/src/modplug/rules.mak|1 -
 contrib/src/ogg/rules.mak|2 +-
 contrib/src/samplerate/rules.mak |1 -
 contrib/src/theora/rules.mak |2 ++
 contrib/src/upnp/rules.mak   |2 ++
 contrib/src/vorbis/rules.mak |1 -
 8 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/contrib/src/dvbpsi/rules.mak b/contrib/src/dvbpsi/rules.mak
index ed9d93e..944c6c1 100644
--- a/contrib/src/dvbpsi/rules.mak
+++ b/contrib/src/dvbpsi/rules.mak
@@ -18,7 +18,6 @@ libdvbpsi: libdvbpsi-$(DVBPSI_VERSION).tar.bz2 .sum-dvbpsi
$(MOVE)
 
 .dvbpsi: libdvbpsi
-   $(RECONF)
cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
cd $< && $(MAKE) install
touch $@
diff --git a/contrib/src/flac/rules.mak b/contrib/src/flac/rules.mak
index 9b1aa0d..dbd0512 100644
--- a/contrib/src/flac/rules.mak
+++ b/contrib/src/flac/rules.mak
@@ -38,7 +38,6 @@ endif
 DEPS_flac = ogg $(DEPS_ogg)
 
 .flac: flac
-   $(RECONF) -I m4
cd $< && $(HOSTVARS) ./configure $(FLACCONF)
cd $http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib: lua: don't use localeconv()

2012-01-05 Thread Rafaël Carré

vlc | branch: master | Rafaël Carré  | Thu Jan  5 04:13:26 
2012 -0500| [6309ae8cb1f75aba2b6a5b3473dc635073c9ab3d] | committer: Rafaël Carré

contrib: lua: don't use localeconv()

not thread-safe, not available on android
just use '.' as decimal separator

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6309ae8cb1f75aba2b6a5b3473dc635073c9ab3d
---

 contrib/src/lua/no-localeconv.patch |   13 +
 contrib/src/lua/rules.mak   |1 +
 2 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/contrib/src/lua/no-localeconv.patch 
b/contrib/src/lua/no-localeconv.patch
new file mode 100644
index 000..02d67c0
--- /dev/null
+++ b/contrib/src/lua/no-localeconv.patch
@@ -0,0 +1,13 @@
+--- lua/src/llex.c.orig2011-12-25 23:39:35.254829002 -0500
 lua/src/llex.c 2011-12-25 23:39:59.662829001 -0500
+@@ -176,9 +176,8 @@
+ 
+ static void trydecpoint (LexState *ls, SemInfo *seminfo) {
+   /* format error: try to update decimal point separator */
+-  struct lconv *cv = localeconv();
+   char old = ls->decpoint;
+-  ls->decpoint = (cv ? cv->decimal_point[0] : '.');
++  ls->decpoint = '.';
+   buffreplace(ls, old, ls->decpoint);  /* try updated decimal separator */
+   if (!luaO_str2d(luaZ_buffer(ls->buff), &seminfo->r)) {
+ /* format error with correct decimal point: no more options */
diff --git a/contrib/src/lua/rules.mak b/contrib/src/lua/rules.mak
index fc11618..765f4e2 100644
--- a/contrib/src/lua/rules.mak
+++ b/contrib/src/lua/rules.mak
@@ -33,6 +33,7 @@ lua: lua-$(LUA_VERSION).tar.gz .sum-lua
$(UNPACK)
$(APPLY) $(SRC)/lua/lua-noreadline.patch
$(APPLY) $(SRC)/lua/luac-32bits.patch
+   $(APPLY) $(SRC)/lua/no-localeconv.patch
 ifdef HAVE_MACOSX
(cd $(UNPACK_DIR) && \
sed -e 's%gcc%$(CC)%' \

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] extra/tools: bump automake version

2012-01-05 Thread Rafaël Carré

vlc | branch: master | Rafaël Carré  | Thu Jan  5 04:02:15 
2012 -0500| [e69c9040387facb214967a14b5adfa0393157ed4] | committer: Rafaël Carré

extra/tools: bump automake version

This version's config.{guess,sub} knows about android

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e69c9040387facb214967a14b5adfa0393157ed4
---

 extras/tools/packages.mak |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/extras/tools/packages.mak b/extras/tools/packages.mak
index 850a851..f0becf8 100644
--- a/extras/tools/packages.mak
+++ b/extras/tools/packages.mak
@@ -13,7 +13,7 @@ LIBTOOL_URL=$(GNU)/libtool/libtool-$(LIBTOOL_VERSION).tar.gz
 AUTOCONF_VERSION=2.68
 AUTOCONF_URL=$(GNU)/autoconf/autoconf-$(AUTOCONF_VERSION).tar.bz2
 
-AUTOMAKE_VERSION=1.11.1
+AUTOMAKE_VERSION=1.11.2
 AUTOMAKE_URL=$(GNU)/automake/automake-$(AUTOMAKE_VERSION).tar.gz
 
 PKGCFG_VERSION=0.23

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib: openjpeg: update config.{guess,sub}

2012-01-05 Thread Rafaël Carré

vlc | branch: master | Rafaël Carré  | Thu Jan  5 03:41:38 
2012 -0500| [2e554edca115a506bdb7ec07323aebf3e628fd0f] | committer: Rafaël Carré

contrib: openjpeg: update config.{guess,sub}

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2e554edca115a506bdb7ec07323aebf3e628fd0f
---

 contrib/src/openjpeg/rules.mak |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/contrib/src/openjpeg/rules.mak b/contrib/src/openjpeg/rules.mak
index 4865b70..360b698 100644
--- a/contrib/src/openjpeg/rules.mak
+++ b/contrib/src/openjpeg/rules.mak
@@ -11,6 +11,7 @@ $(TARBALLS)/openjpeg_v$(OPENJPEG_VERSION).tgz:
 openjpeg: openjpeg_v$(OPENJPEG_VERSION).tgz .sum-openjpeg
$(UNPACK)
$(APPLY) $(SRC)/openjpeg/pkg-config.patch
+   $(UPDATE_AUTOCONFIG)
$(MOVE)
 
 .openjpeg: openjpeg

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] x264.c: use x264_param_apply_profile

2012-01-05 Thread Ilkka Ollakka

vlc | branch: master | Ilkka Ollakka  | Thu Jan  5 12:53:30 
2012 +0200| [1f62e75db43063d4fc1a793ec3ba1bdf1b6fac94] | committer: Ilkka 
Ollakka

x264.c: use x264_param_apply_profile

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1f62e75db43063d4fc1a793ec3ba1bdf1b6fac94
---

 modules/codec/x264.c |   18 +-
 1 files changed, 1 insertions(+), 17 deletions(-)

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index 0149cb6..60cd3b2 100644
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -1164,23 +1164,7 @@ static int  Open ( vlc_object_t *p_this )
  * settings, and apply those*/
 psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "profile" );
 if( psz_val )
-{
-if( !strcasecmp( psz_val, "baseline" ) )
-{
-msg_Dbg( p_enc, "Limiting to baseline profile");
-p_sys->param.analyse.b_transform_8x8 = 0;
-p_sys->param.b_cabac = 0;
-p_sys->param.i_bframe = 0;
-p_sys->param.analyse.i_weighted_pred = X264_WEIGHTP_NONE;
-p_sys->param.i_bframe_pyramid = X264_B_PYRAMID_NONE;
-}
-else if (!strcasecmp( psz_val, "main" ) )
-{
-msg_Dbg( p_enc, "Limiting to main-profile");
-p_sys->param.analyse.b_transform_8x8 = 0;
-}
-/* high profile don't restrict stuff*/
-}
+x264_param_apply_profile( &p_sys->param, psz_val );
 free( psz_val );
 
 

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] x264.c: move mbtree closer to other bitrate options

2012-01-05 Thread Ilkka Ollakka

vlc | branch: master | Ilkka Ollakka  | Thu Jan  5 12:50:38 
2012 +0200| [140a7dbc9bcb4cb717fd955e98d4c27abc077ffe] | committer: Ilkka 
Ollakka

x264.c: move mbtree closer to other bitrate options

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=140a7dbc9bcb4cb717fd955e98d4c27abc077ffe
---

 modules/codec/x264.c |6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index 5bcb4ed..0149cb6 100644
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -847,6 +847,9 @@ static int  Open ( vlc_object_t *p_this )
 p_sys->param.rc.i_vbv_max_bitrate = var_GetInteger( p_enc, SOUT_CFG_PREFIX 
"vbv-maxrate" );
 
 
+if( !var_GetBool( p_enc, SOUT_CFG_PREFIX "mbtree" ) )
+   p_sys->param.rc.b_mb_tree = var_GetBool( p_enc, SOUT_CFG_PREFIX 
"mbtree" );
+
 if( !var_GetBool( p_enc, SOUT_CFG_PREFIX "cabac" ) )
 p_sys->param.b_cabac = var_GetBool( p_enc, SOUT_CFG_PREFIX "cabac" );
 
@@ -1221,9 +1224,6 @@ static int  Open ( vlc_object_t *p_this )
 p_sys->param.rc.b_stat_read = i_val & 2;
 }
 
-if( !var_GetBool( p_enc, SOUT_CFG_PREFIX "mbtree" ) )
-   p_sys->param.rc.b_mb_tree = var_GetBool( p_enc, SOUT_CFG_PREFIX 
"mbtree" );
-
 /* We need to initialize pthreadw32 before we open the encoder,
but only once for the whole application. Since pthreadw32
doesn't keep a refcount, do it ourselves. */

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] x264.c: partly revert vbv-bufsize option handling when bitrate is defined

2012-01-05 Thread Ilkka Ollakka

vlc | branch: master | Ilkka Ollakka  | Thu Jan  5 12:44:19 
2012 +0200| [f1e222cf3197da2a0c395b5a8eae745e470d312e] | committer: Ilkka 
Ollakka

x264.c: partly revert vbv-bufsize option handling when bitrate is defined

Previous code didn't actually behave so well with small keyints etc.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f1e222cf3197da2a0c395b5a8eae745e470d312e
---

 modules/codec/x264.c |   22 +-
 1 files changed, 1 insertions(+), 21 deletions(-)

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index c5d63d2..5bcb4ed 100644
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -844,12 +844,7 @@ static int  Open ( vlc_object_t *p_this )
 SOUT_CFG_PREFIX "vbv-bufsize" );
 
 /* max bitrate = average bitrate -> CBR */
-i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "vbv-maxrate" );
-
-if( !i_val && p_sys->param.rc.i_rc_method == X264_RC_ABR )
-p_sys->param.rc.i_vbv_max_bitrate = p_sys->param.rc.i_bitrate;
-else if ( i_val )
-p_sys->param.rc.i_vbv_max_bitrate = i_val;
+p_sys->param.rc.i_vbv_max_bitrate = var_GetInteger( p_enc, SOUT_CFG_PREFIX 
"vbv-maxrate" );
 
 
 if( !var_GetBool( p_enc, SOUT_CFG_PREFIX "cabac" ) )
@@ -1162,21 +1157,6 @@ static int  Open ( vlc_object_t *p_this )
 if( i_val > 0 )
 p_sys->param.i_slice_max_mbs = i_val;
 
-
-/* x264 vbv-bufsize = 0 (default). if not provided set period
-   in seconds for local maximum bitrate (cache/bufsize) based
-   on average bitrate when use has told bitrate.
-   vbv-buffer size is set to bitrate * secods between keyframes */
-if( !p_sys->param.rc.i_vbv_buffer_size &&
- p_sys->param.rc.i_rc_method == X264_RC_ABR &&
- p_sys->param.i_fps_num )
-{
-p_sys->param.rc.i_vbv_buffer_size = p_sys->param.rc.i_bitrate *
-p_sys->param.i_fps_den;
-p_sys->param.rc.i_vbv_buffer_size *= p_sys->param.i_keyint_max;
-p_sys->param.rc.i_vbv_buffer_size /= p_sys->param.i_fps_num;
-}
-
 /* Check if user has given some profile (baseline,main,high) to limit
  * settings, and apply those*/
 psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "profile" );

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] x264.c: support infinite keyint option with -1

2012-01-05 Thread Ilkka Ollakka

vlc | branch: master | Ilkka Ollakka  | Thu Jan  5 12:41:36 
2012 +0200| [d06b1ce64a4438ffbab18b87a5c4eabcc0b90a46] | committer: Ilkka 
Ollakka

x264.c: support infinite keyint option with -1

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d06b1ce64a4438ffbab18b87a5c4eabcc0b90a46
---

 modules/codec/x264.c |5 -
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index 96cdf3d..c5d63d2 100644
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -57,7 +57,7 @@ static void Close( vlc_object_t * );
 #define KEYINT_TEXT N_("Maximum GOP size")
 #define KEYINT_LONGTEXT N_( "Sets maximum interval between IDR-frames." \
 "Larger values save bits, thus improving quality for a given bitrate at " \
-"the cost of seeking precision." )
+"the cost of seeking precision. Use -1 for infinite." )
 
 #define MIN_KEYINT_TEXT N_("Minimum GOP size")
 #define MIN_KEYINT_LONGTEXT N_( "Sets minimum interval between IDR-frames. " \
@@ -924,6 +924,9 @@ static int  Open ( vlc_object_t *p_this )
 
 i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "keyint" );
 if( i_val > 0 && i_val != 250 ) p_sys->param.i_keyint_max = i_val;
+#if X264_BUILD >= 102
+if( i_val == -1 ) p_sys->param.i_keyint_max = X264_KEYINT_MAX_INFINITE;
+#endif
 
 i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "min-keyint" );
 if( i_val > 0 && i_val != 25 ) p_sys->param.i_keyint_min = i_val;

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

66 matches

Mail list logo