please condider mplayer 1.0~rc1-12etch

[A Mennucc]

hi

I prepared a new version of MPlayer 1.0~rc1-12etch  ; I uploaded it into
 t-p-u ; please condider for unblocking

An important note:  ignore anything in debian/patches in the attached
interdiff: those files are there for documentation
and future reference, but are not automatically applied or removed at
build time

a.


diff -u mplayer-1.0~rc1/debian/changelog mplayer-1.0~rc1/debian/changelog
--- mplayer-1.0~rc1/debian/changelog
+++ mplayer-1.0~rc1/debian/changelog
@@ -1,3 +1,20 @@
+mplayer (1.0~rc1-12etch) testing-proposed-updates; urgency=medium
+
+  * fix for CVE-2007-1246 and similar (Closes: #414075)
+    thanks Kees Cook & Moritz Jodeitand & R Togni
+    patches for files
+      loader/dmo/DMO_VideoDecoder.c from SVN 22204
+      loader/dshow/DS_VideoDecoder.c from SVN 22205
+  * patch for ia64 unaligned access crash,
+     thanks to Bryan Stillwell for debugging &  
+      Reimar Döffinger for the patch (Closes: #409431).
+  * [INTL] Japanese po-debconf templates translation,
+     thanks to Kobayashi Noritada (Closes: #413120).
+  * [INTL] Dutch po-debconf translation, thanks cobaco (Closes: #413880)
+  * [INTL] Russian po-debconf translation, thanks  Yuri Kozlov (Closes: 
#414251)
+  
+ -- A Mennucc1 <[EMAIL PROTECTED]>  Sun, 18 Mar 2007 15:13:11 +0100
+
 mplayer (1.0~rc1-12) unstable; urgency=medium
 
   * (possible) security fixes  backported from SVN
only in patch2:
unchanged:
--- mplayer-1.0~rc1.orig/debian/patches/mp3libunal.diff
+++ mplayer-1.0~rc1/debian/patches/mp3libunal.diff
@@ -0,0 +1,51 @@
+Index: mp3lib/sr1.c
+===================================================================
+--- mp3lib/sr1.c       (revision 22099)
++++ mp3lib/sr1.c       (working copy)
+@@ -315,7 +315,10 @@
+  */
+ LOCAL int read_frame(struct frame *fr){
+   unsigned long newhead;
+-  unsigned char hbuf[8];
++  union {
++    unsigned char buf[8];
++    unsigned long dummy; // for alignment
++  } hbuf;
+   int skipped,resyncpos;
+   int frames=0;
+ 
+@@ -325,7 +328,7 @@
+ 
+   set_pointer(512);
+   fsizeold=fr->framesize;       /* for Layer3 */
+-  if(!stream_head_read(hbuf,&newhead)) return 0;
++  if(!stream_head_read(hbuf.buf,&newhead)) return 0;
+   if(!decode_header(fr,newhead)){
+     // invalid header! try to resync stream!
+ #ifdef DEBUG_RESYNC
+@@ -333,7 +336,7 @@
+ #endif
+ retry1:
+     while(!decode_header(fr,newhead)){
+-      if(!stream_head_shift(hbuf,&newhead)) return 0;
++      if(!stream_head_shift(hbuf.buf,&newhead)) return 0;
+     }
+     resyncpos=MP3_fpos-4;
+     // found valid header
+@@ -343,14 +346,14 @@
+     if(!stream_read_frame_body(fr->framesize)) return 0; // read body
+     set_pointer(512);
+     fsizeold=fr->framesize;       /* for Layer3 */
+-    if(!stream_head_read(hbuf,&newhead)) return 0;
++    if(!stream_head_read(hbuf.buf,&newhead)) return 0;
+     if(!decode_header(fr,newhead)){
+       // invalid hdr! go back...
+ #ifdef DEBUG_RESYNC
+       printf("INVALID\n");
+ #endif
+ //      mp3_seek(resyncpos+1);
+-      if(!stream_head_read(hbuf,&newhead)) return 0;
++      if(!stream_head_read(hbuf.buf,&newhead)) return 0;
+       goto retry1;
+     }
+ #ifdef DEBUG_RESYNC
only in patch2:
unchanged:
--- mplayer-1.0~rc1.orig/debian/patches/CVE-2007-1246.patch
+++ mplayer-1.0~rc1/debian/patches/CVE-2007-1246.patch
@@ -0,0 +1,28 @@
+diff -pruN 2:1.0~rc1-0ubuntu3/debian/changelog 
2:1.0~rc1-0ubuntu4/debian/changelog
+--- 2:1.0~rc1-0ubuntu3/debian/changelog        2007-03-07 01:22:13.000000000 
+0000
++++ 2:1.0~rc1-0ubuntu4/debian/changelog        2007-03-07 01:22:11.000000000 
+0000
+@@ -1,3 +1,13 @@
++mplayer (2:1.0~rc1-0ubuntu4) feisty; urgency=low
++
++  * SECURITY UPDATE: DMO decoder heap overflow.
++  * loader/dmo/DMO_VideoDecoder.c: added upstream fix.
++  * References
++    
http://svn.mplayerhq.hu/mplayer/trunk/loader/dmo/DMO_VideoDecoder.c?r1=22019&r2=22204
++    CVE-2007-1246
++
++ -- Kees Cook <[EMAIL PROTECTED]>  Tue,  6 Mar 2007 15:21:26 -0800
++
+ mplayer (2:1.0~rc1-0ubuntu3) feisty; urgency=low
+ 
+   * debian/rules:
+diff -pruN 2:1.0~rc1-0ubuntu3/loader/dmo/DMO_VideoDecoder.c 
2:1.0~rc1-0ubuntu4/loader/dmo/DMO_VideoDecoder.c
+--- 2:1.0~rc1-0ubuntu3/loader/dmo/DMO_VideoDecoder.c   2007-02-03 
04:00:24.000000000 +0000
++++ 2:1.0~rc1-0ubuntu4/loader/dmo/DMO_VideoDecoder.c   2007-03-07 
01:22:11.000000000 +0000
+@@ -121,6 +121,7 @@ DMO_VideoDecoder * DMO_VideoDecoder_Open
+      
+         this->iv.m_bh = malloc(bihs);
+         memcpy(this->iv.m_bh, format, bihs);
++      this->iv.m_bh->biSize = bihs;
+ 
+         this->iv.m_State = STOP;
+         //this->iv.m_pFrame = 0;
only in patch2:
unchanged:
--- mplayer-1.0~rc1.orig/debian/patches/DS_VideoDecoder.c---SVN--22205.patch
+++ mplayer-1.0~rc1/debian/patches/DS_VideoDecoder.c---SVN--22205.patch
@@ -0,0 +1,10 @@
+--- trunk/loader/dshow/DS_VideoDecoder.c       2007/01/26 09:21:22     22019
++++ trunk/loader/dshow/DS_VideoDecoder.c       2007/02/11 17:57:02     22205
+@@ -114,6 +114,7 @@
+      
+         this->iv.m_bh = malloc(bihs);
+         memcpy(this->iv.m_bh, format, bihs);
++        this->iv.m_bh->biSize = bihs;
+ 
+         this->iv.m_State = STOP;
+         //this->iv.m_pFrame = 0;
only in patch2:
unchanged:
--- mplayer-1.0~rc1.orig/debian/po/ja.po
+++ mplayer-1.0~rc1/debian/po/ja.po
@@ -0,0 +1,212 @@
+# Japanese debconf templates translation for mplayer.
+# Copyright (C) 2007 Noritada Kobayashi
+# This file is distributed under the same license as the mplayer package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: mplayer (debconf) 1.0~rc1-12\n"
+"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
+"POT-Creation-Date: 2006-11-19 21:34+0100\n"
+"PO-Revision-Date: 2007-03-02 22:19+0900\n"
+"Last-Translator: Noritada Kobayashi <[EMAIL PROTECTED]>\n"
+"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:1001
+msgid "Create your ~/.mplayer/mplayer.conf file"
+msgstr "~/.mplayer/mplayer.conf ファイルを作成してください"
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:1001
+msgid ""
+"Performance of MPlayer depends heavily on hardware - this means that it may "
+"benefit from tweaking options, for every single machine it's installed to. "
+"You may wish to read the documentation (it is in the package 'mplayer-doc', "
+"under /usr/share/doc/mplayer-doc/). This DebConf interface will help you "
+"setup just a few main features; you may wish to add to /etc/mplayer/mplayer."
+"conf some more refined options (to enable multichannel audio, or video "
+"postprocessing, etc etc); and any user similarly may customize MPlayer using "
+"the file ~/.mplayer/config"
+msgstr ""
+"MPlayer 
の実行性能はハードウェアに強く依存します。つまり、インストールされて"
+"いる各マシンでオプションを微調整すると MPlayer 
がより好ましい動作をする可能性"
+"があります。そのために付属文書を読む必要があるかもしれません
 (付属文書は "
+"'mplayer-doc' パッケージの /usr/share/doc/mplayer-doc/ 
以下にあります)。この "
+"DebConf 
インタフェースは、いくつかの主要な機能の設定を手助けするだけです。(マ"
+"ルチチャンネルオーディオや映像の後処理などを有効にするために)
 いくつかのさら"
+"に細かいオプションを /etc/mplayer/mplayer.conf 
に追加する必要があるかもしれま"
+"せん。また、同様にどのユーザもファイル ~/.mplayer/config 
を使用して MPlayer "
+"をカスタマイズできます。"
+
+#. Type: boolean
+#. Description
+#: ../mplayer.templates:2001
+msgid "Enable access to RTC?"
+msgstr "RTC へのアクセスを可能にしますか?"
+
+#. Type: boolean
+#. Description
+#: ../mplayer.templates:2001
+msgid ""
+"On older kernels MPlayer can use the RTC (Real Time Clock) to provide better "
+"timing in reproduction, with less CPU cost; to this end, though, the device /"
+"dev/rtc must be accessible to group audio, and the default max-user-freq "
+"must be raised to 1024.  Any needed change must be done by root. If you "
+"wish, MPlayer will automatically do this at boot, so that any user can enjoy "
+"this feature. Note that there may be security issues with this (although "
+"none are known now)."
+msgstr ""
+"古いカーネル上で動かす場合、MPlayer は、再生時に RTC 
(リアルタイムクロック) "
+"を使用し、より少ない CPU 
消費でよりよい同期をすることが可能です。しかしそのた"
+"めには、デバイス /dev/rtc を audio 
グループからアクセス可能にし、max-user-"
+"freq のデフォルト値を 1024 
に上げなければなりません。必要な変更はすべて root "
+"で行わなければなりません。お望みなら、起動時に MPlayer 
が自動的にこれらの変更"
+"を行うようにして、すべてのユーザがこの機能を楽しめるようにできます。このオプ"
+"ションを有効にすると、(今のところは知られていませんが)
 セキュリティ上の問題点"
+"ができるかもしれないことに注意してください。"
+
+#. Type: boolean
+#. Description
+#: ../mplayer.templates:3001
+msgid "Replace existing configuration file?"
+msgstr "既存の設定ファイルを置き換えますか?"
+
+#. Type: boolean
+#. Description
+#: ../mplayer.templates:3001
+msgid ""
+"There is already a file /etc/mplayer/mplayer.conf, but it does not contain "
+"an automatically generated part. This script may generate a new file (the "
+"old file will be moved to /etc/mplayer/mplayer.conf.debconf-old)."
+msgstr ""
+"ファイル /etc/mplayer/mplayer.conf 
が既に存在しますが、このファイルには自動生"
+"成された部分が含まれていません。本スクリプトの実行により新しいファイルが生成"
+"される可能性があります (古いファイルは 
/etc/mplayer/mplayer.conf.debconf-old "
+"に移動します)。"
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:4001
+msgid "Files not replaced"
+msgstr "ファイルは置き換えられませんでした"
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:4001
+msgid ""
+"It seems that you don't want to replace your existing configuration file /"
+"etc/mplayer/mplayer.conf.  If you change your mind later, you can run \"dpkg-"
+"reconfigure mplayer\"."
+msgstr ""
+"既存の設定ファイル /etc/mplayer/mplayer.conf 
を置き換えることを望まないようで"
+"すね。後で気が変わった場合は \"dpkg-reconfigure mplayer\" 
を実行してくださ"
+"い。"
+
+#. Type: select
+#. Description
+#: ../mplayer.templates:5001
+msgid "MPlayer video output:"
+msgstr "MPlayer ビデオ出力:"
+
+# TRANSLATION-FIXME: Use "ja" instead of "en", if available
+#. Type: select
+#. Description
+#: ../mplayer.templates:5001
+msgid ""
+"MPlayer can use a very wide range of video output drivers; it will try to "
+"autodetect the best one, but you may choose a preferred one. Here is the a "
+"guide to the choice (in decreasing order of speed): (1) if you see an entry "
+"that matches your video card, choose that; (2) if your video card supports "
+"'XV', choose that (use 'xvinfo' to know). You should read /usr/share/doc/"
+"mplayer-doc/HTML/en/devices.html (it is in package 'mplayer-doc')."
+msgstr ""
+"MPlayer 
は非常に多様なビデオ出力ドライバを使用できます。MPlayer 
は最良のドラ"
+"イバを自動検出しようとしますが、使用したいものを自分で選択することも可能で"
+"す。ここに選択の指針を示します 
(スピードの速い順です)。(1) ビデオカードにマッ"
+"チするエントリがある場合、それを選択してください。(2)
 ビデオカードが 'XV' を"
+"サポートしている場合、それを選択してください ('xvinfo' 
を使用するとわかるで"
+"しょう)。/usr/share/doc/mplayer-doc/HTML/en/devices.html 
も参照してください "
+"(このファイルは 'mplayer-doc' 
パッケージに含まれています)。"
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:6001
+msgid "How to download binary codecs"
+msgstr "バイナリコーデックのダウンロード方法"
+
+# FIXME: Remove white spaces after "Real 3.0" and "those".
+# FIXME: "QuickTime audio" should be "QuickTime Audio".
+# FIXME: Capitalize "internet".
+#. Type: note
+#. Description
+#: ../mplayer.templates:6001
+msgid ""
+"MPlayer supports most codecs out of the box and the rest with the help of "
+"binary codecs. Binary codecs are only necessary for Real 3.0  and 4.0, "
+"Windows Media 9, QuickTime audio and some very obscure codecs. Debian cannot "
+"distribute these codecs, but these are available on the internet for "
+"download. Run the script `/usr/share/mplayer/scripts/binary_codecs.sh' to "
+"install those  made available from MPlayer web site."
+msgstr ""
+"MPlayer 
は、大半のコーデックについては最初からサポートしており、残りのコー"
+"デックについてもバイナリコーデックの助けを借りてサポートしています。バイナリ"
+"コーデックは、Real 3.0 と 4.0、Windows Media 9、QuickTime Audio 
やいくつかの"
+"非常に無名のコーデックについてのみ必要となります。これらのコーデックは
 "
+"Debian 
では配布できませんが、インターネットからダウンロードして利用できます。"
+"スクリプト `/usr/share/mplayer/scripts/binary_codecs.sh' 
を実行し、MPlayer の"
+"ウェブサイトから入手可能になっているこれらのコーデックをインストールしてくだ"
+"さい。"
+
+#. Type: string
+#. Description
+#: ../mplayer.templates:7001
+msgid "DVD device name:"
+msgstr "DVD デバイス名:"
+
+#. Type: string
+#. Description
+#: ../mplayer.templates:7001
+msgid "What is the name of your DVD device (if any):"
+msgstr "(DVD デバイスがある場合は) 
デバイスの名前を入力してください:"
+
+#. Type: select
+#. Description
+#: ../mplayer.templates:8001
+msgid "MPlayer OSD font:"
+msgstr "MPlayer OSD フォント:"
+
+# FIXME: True Type should be TrueType.
+#. Type: select
+#. Description
+#: ../mplayer.templates:8001
+msgid ""
+" MPlayer needs True Type fonts for On Screen Display. Choose your favorite."
+msgstr ""
+"MPlayer ではオンスクリーンディスプレイ (OSD) に TrueType 
フォントが必要となり"
+"ます。好みのものを選択してください。"
+
+# FIXME: Decapitalize "Fonts".
+#. Type: note
+#. Description
+#: ../mplayer.templates:9001
+msgid "MPlayer cannot find TrueType Fonts"
+msgstr "Mplayer は TrueType 
フォントを見つけることができません"
+
+# FIXME: "truetype" should be "TrueType".
+# FIXME: Remove white spaces after "such as" and "'ttf-bitstream-vera' or".
+#. Type: note
+#. Description
+#: ../mplayer.templates:9001
+msgid ""
+"You should install a package providing truetype fonts (such as   'ttf-"
+"freefont' or 'ttf-bitstream-vera' or  'msttcorefonts' ) and reconfigure "
+"MPlayer (with the command \"dpkg-reconfigure mplayer\")"
+msgstr ""
+"TrueType フォントを提供しているパッケージ ('ttf-freefont' や 
'ttf-bitstream-"
+"vera'、'msttcorefonts' など) 
をインストールし、その上で、(コマンド \"dpkg-"
+"reconfigure mplayer\" で) MPlayer を再設定してください。"
only in patch2:
unchanged:
--- mplayer-1.0~rc1.orig/debian/po/ru.po
+++ mplayer-1.0~rc1/debian/po/ru.po
@@ -0,0 +1,206 @@
+# Translation of mplayer debconf templates to Russian
+# Copyright (C) Sergey V. Mironov <[EMAIL PROTECTED]>, 2007.
+# This file is distributed under the same license as the mplayer package.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: mplayer_1.0RC1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-11-19 21:34+0100\n"
+"PO-Revision-Date: 2007-03-04 18:12+0300\n"
+"Last-Translator: Sergey V. Mironov <[EMAIL PROTECTED]>\n"
+"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:1001
+msgid "Create your ~/.mplayer/mplayer.conf file"
+msgstr "Создайте ваш ~/.mplayer/mplayer.conf файл"
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:1001
+msgid ""
+"Performance of MPlayer depends heavily on hardware - this means that it may "
+"benefit from tweaking options, for every single machine it's installed to. "
+"You may wish to read the documentation (it is in the package 'mplayer-doc', "
+"under /usr/share/doc/mplayer-doc/). This DebConf interface will help you "
+"setup just a few main features; you may wish to add to /etc/mplayer/mplayer. "
+"conf some more refined options (to enable multichannel audio, or video "
+"postprocessing, etc etc); and any user similarly may customize MPlayer using "
+"the file ~/.mplayer/config"
+msgstr ""
+"Производительность MPlayer'а сильно зависит 
от оборудования. Это означает, "
+"что можно получить выгоду, настроив 
параметры под конкретную систему, "
+"на котором он установлен. Возможно, вы 
захотите ознакомиться с "
+"документацией (она находится в пакете 
'mplayer-doc', в каталоге /usr/share/"
+"doc/mplayer-doc/). Интерфейс DebConf поможет вам 
настроить лишь "
+"некоторые основные опции; вы также можете 
захотеть добавить в /etc/"
+"mplayer/mplayer.conf дополнительные параметры 
настройки (для включения "
+"многоканального звука, постобработки 
видео и так далее). Каждый по "
+"отдельности пользователь может настроить 
MPlayer, используя файл "
+"~/.mplayer/config"
+
+#. Type: boolean
+#. Description
+#: ../mplayer.templates:2001
+msgid "Enable access to RTC?"
+msgstr "Включить доступ к RTC?"
+
+#. Type: boolean
+#. Description
+#: ../mplayer.templates:2001
+msgid ""
+"On older kernels MPlayer can use the RTC (Real Time Clock) to provide better "
+"timing in reproduction, with less CPU cost; to this end, though, the device /"
+"dev/rtc must be accessible to group audio, and the default max-user-freq "
+"must be raised to 1024.  Any needed change must be done by root. If you "
+"wish, MPlayer will automatically do this at boot, so that any user can enjoy "
+"this feature. Note that there may be security issues with this (although "
+"none are known now)."
+msgstr ""
+"На ранних ядрах MPlayer может использовать RTC 
(Real Time Clock), чтобы "
+"добавить бОльшую частоту дискредитации 
при воспроизведении и меньшей "
+"загрузкой процессора; для этого должен 
быть доступ к устройству /dev/rtc, "
+" и значение по умолчанию параметра max-user-freq 
должен быть увеличено "
+"до 1024. Все изменения необходимо делать с 
правами суперпользователя. "
+"MPlayer может автоматически делать это при 
загрузке, причём действие "
+"данной опции распространится на всех 
пользователей. Заметим, что "
+"возможны проблемы с безопасностью (хотя 
ни об одной пока не известно)."
+
+#. Type: boolean
+#. Description
+#: ../mplayer.templates:3001
+msgid "Replace existing configuration file?"
+msgstr "Заменить существующий файл 
конфигурации?"
+
+#. Type: boolean
+#. Description
+#: ../mplayer.templates:3001
+msgid ""
+"There is already a file /etc/mplayer/mplayer.conf, but it does not contain "
+"an automatically generated part. This script may generate a new file (the "
+"old file will be moved to /etc/mplayer/mplayer.conf.debconf-old)."
+msgstr ""
+"Файл /etc/mplayer/mplayer.conf уже существует, но не 
содержит "
+"формируемой автоматически части. Этот 
скрипт может создать новый файл "
+"(старый файл будет переименован в 
/etc/mplayer/mplayer.conf.debconf-old)."
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:4001
+msgid "Files not replaced"
+msgstr "Файлы не заменены"
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:4001
+msgid ""
+"It seems that you don't want to replace your existing configuration file /"
+"etc/mplayer/mplayer.conf.  If you change your mind later, you can run \"dpkg-"
+"reconfigure mplayer\"."
+msgstr ""
+"По всей видимости, вы не хотите заменить 
ваш существующий "
+"конфигурационный файл /etc/mplayer/mplayer.conf. Если 
вы захотите "
+"сделать это позже, вам надо будет 
выполнить команду "
+" \"dpkg-reconfigure mplayer\"."
+
+#. Type: select
+#. Description
+#: ../mplayer.templates:5001
+msgid "MPlayer video output:"
+msgstr "Режим вывода видео MPlayer'а:"
+
+#. Type: select
+#. Description
+#: ../mplayer.templates:5001
+msgid ""
+"MPlayer can use a very wide range of video output drivers; it will try to "
+"autodetect the best one, but you may choose a preferred one. Here is the a "
+"guide to the choice (in decreasing order of speed): (1) if you see an entry "
+"that matches your video card, choose that; (2) if your video card supports "
+"'XV', choose that (use 'xvinfo' to know). You should read /usr/share/doc/"
+"mplayer-doc/HTML/en/devices.html (it is in package 'mplayer-doc')."
+msgstr ""
+"MPlayer может использовать очень большое 
количество режимов вывода "
+"видео, он попытается определить 
автоматически наилучший, но вы можете "
+"выбрать его и вручную."
+"Здесь есть небольшая подсказка (по 
порядку убывания скорости): "
+"(1) если вы видите название вашей 
видеокарты, выберите это; "
+"(2) если ваша видеокарта поддерживает 'XV', 
выберите этот пункт "
+" (используйте 'xvinfo', чтобы убедиться). 
Прочтите /usr/share/doc/mplayer-doc/"
+"HTML/en/devices.html (в пакете 'mplayer-doc')."
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:6001
+msgid "How to download binary codecs"
+msgstr "Как загрузить бинарные кодеки"
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:6001
+msgid ""
+"MPlayer supports most codecs out of the box and the rest with the help of "
+"binary codecs. Binary codecs are only necessary for Real 3.0  and 4.0, "
+"Windows Media 9, QuickTime audio and some very obscure codecs. Debian cannot "
+"distribute these codecs, but these are available on the internet for "
+"download. Run the script `/usr/share/mplayer/scripts/binary_codecs.sh' to "
+"install those  made available from MPlayer web site."
+msgstr ""
+"MPlayer поддерживает большинство кодеков \"из 
коробки\", а остальные с "
+"помощью бинарных кодеков. Бинарные кодеки 
нужны только для Real 3.0 и "
+"4.0, Windows Media 9, QuickTime audio и некоторых других 
малоизвестных "
+"кодеков. В Дебиан данные кодеки не 
включены, но есть возможность "
+"загрузить их из интернета. Запустите 
скрипт `/usr/share/mplayer/scripts/"
+"binary_codecs.sh' для того, чтобы установить их с 
интернет-сайта MPlayer'а."
+
+#. Type: string
+#. Description
+#: ../mplayer.templates:7001
+msgid "DVD device name:"
+msgstr "Имя устройства DVD:"
+
+#. Type: string
+#. Description
+#: ../mplayer.templates:7001
+msgid "What is the name of your DVD device (if any):"
+msgstr "Название вашего DVD-устройства (или 
другое):"
+
+#. Type: select
+#. Description
+#: ../mplayer.templates:8001
+msgid "MPlayer OSD font:"
+msgstr "Шрифт OSD в MPlayer'е:"
+
+#. Type: select
+#. Description
+#: ../mplayer.templates:8001
+msgid ""
+" MPlayer needs True Type fonts for On Screen Display. Choose your favorite."
+msgstr ""
+"MPlayer'у требуются шрифты TrueType для вывода 
субтитров. Выберите "
+"ваш любимый шрифт."
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:9001
+msgid "MPlayer cannot find TrueType Fonts"
+msgstr "MPlayer не нашёл шрифты TrueType"
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:9001
+msgid ""
+"You should install a package providing truetype fonts (such as   'ttf-"
+"freefont' or 'ttf-bitstream-vera' or  'msttcorefonts' ) and reconfigure "
+"MPlayer (with the command \"dpkg-reconfigure mplayer\")"
+msgstr ""
+"Вам нужно установить пакет с шрифтами 
truetype (например, 'ttf-"
+"freefont' или 'ttf-bitstream-vera' или 'msttcorefonts') и "
+"переконфигурировать MPlayer (запустив 
команду "
+"\"dpkg-reconfigure mplayer\")."
only in patch2:
unchanged:
--- mplayer-1.0~rc1.orig/debian/po/nl.po
+++ mplayer-1.0~rc1/debian/po/nl.po
@@ -0,0 +1,130 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <[EMAIL PROTECTED]>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: mplayer\n"
+"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
+"POT-Creation-Date: 2006-11-19 21:34+0100\n"
+"PO-Revision-Date: 2007-02-25 16:44+0100\n"
+"Last-Translator: Bart Cornelis <[EMAIL PROTECTED]>\n"
+"Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: nl\n"
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:1001
+msgid "Create your ~/.mplayer/mplayer.conf file"
+msgstr "Uw '~/.mplayer/mplayer.conf' bestand aanmaken"
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:1001
+msgid "Performance of MPlayer depends heavily on hardware - this means that it 
may benefit from tweaking options, for every single machine it's installed to. 
You may wish to read the documentation (it is in the package 'mplayer-doc', 
under /usr/share/doc/mplayer-doc/). This DebConf interface will help you setup 
just a few main features; you may wish to add to /etc/mplayer/mplayer.conf some 
more refined options (to enable multichannel audio, or video postprocessing, 
etc etc); and any user similarly may customize MPlayer using the file 
~/.mplayer/config"
+msgstr "Performantie van MPlayer is sterk afhankelijk van de hardware. Dit 
betekend ook dat er groot voordeel te halen is van het specifiek aanpassen van 
de opties voor elke machine waarop u dit pakket installeert. U kunt best de 
docemtatie nalezen (deze vindt u na installatie van het 'mplayer-doc'-pakket in 
de map /usr/share/doc/mplayer-doc). Deze debconf-interface helpt u alleen met 
het instellen van enkele van de meest belangrijke features; het is dus 
denkelijk dat u de opties in /etc/mplayer/mplayer.conf verder wilt verfijnen 
(om bijvoorbeel multikanaal audio, of video postprocessing, of ... te 
activeren). Elke gebruiker kan MPlayer verder aanpassen via het bestand 
~/.mplayer/config ."
+
+#. Type: boolean
+#. Description
+#: ../mplayer.templates:2001
+msgid "Enable access to RTC?"
+msgstr "Toegang tot de RTC (Real Time Clock) activeren?"
+
+#. Type: boolean
+#. Description
+#: ../mplayer.templates:2001
+msgid "On older kernels MPlayer can use the RTC (Real Time Clock) to provide 
better timing in reproduction, with less CPU cost; to this end, though, the 
device /dev/rtc must be accessible to group audio, and the default 
max-user-freq must be raised to 1024.  Any needed change must be done by root. 
If you wish, MPlayer will automatically do this at boot, so that any user can 
enjoy this feature. Note that there may be security issues with this (although 
none are known now)."
+msgstr "Voor oudere kernels kan MPlayer de RTC (Real Time Clock) gebruiken 
voor bettere getimede reproductie, aan minder grote CPU-kost. Opdat dit 
mogelijk zou zijn dient het apparaat /dev/rtc toegankelijk te zijn voor de 
'audio'-groep, en dient de max-user-freq opgehoogt te worden naar 1024. Deze 
benodigde aanpassingen dienen door root uitgevoerd te worden. Als u dit wenst 
kan MPlayer dit automatisch tijdens het opstarten doen. Opgelet! Dit kan 
beveiliginsproblemen opleveren (hoewel er momenteel geen beveiligins problemen 
bekend zijn)."
+
+#. Type: boolean
+#. Description
+#: ../mplayer.templates:3001
+msgid "Replace existing configuration file?"
+msgstr "Wilt u het bestaand configuratiebestand vervangen?"
+
+#. Type: boolean
+#. Description
+#: ../mplayer.templates:3001
+msgid "There is already a file /etc/mplayer/mplayer.conf, but it does not 
contain an automatically generated part. This script may generate a new file 
(the old file will be moved to /etc/mplayer/mplayer.conf.debconf-old)."
+msgstr "Er bestaat reeds een bestand '/etc/mplayer/mplayer.conf', dit 
bestaande bestand bevat geen automatisch gegenereerd deel. Dit script maakt een 
nieuw bestand aan (het oude bestand wordt verplaatst naar 
'/etc/mplayer/mplayer.conf.debconf-old). "
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:4001
+msgid "Files not replaced"
+msgstr "Bestanden zijn niet vervangen"
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:4001
+msgid "It seems that you don't want to replace your existing configuration 
file /etc/mplayer/mplayer.conf.  If you change your mind later, you can run 
\"dpkg-reconfigure mplayer\"."
+msgstr "U geeft aan dat u het bestaande configuratiebestand niet wilt 
vervangen. Als u later van gedacht vervanderd kunt u dit alsnog laten doen via 
het commando 'dpkg-reconfigure mplayer'."
+
+#. Type: select
+#. Description
+#: ../mplayer.templates:5001
+msgid "MPlayer video output:"
+msgstr "MPlayer-video-uitvoer:"
+
+#. Type: select
+#. Description
+#: ../mplayer.templates:5001
+msgid "MPlayer can use a very wide range of video output drivers; it will try 
to autodetect the best one, but you may choose a preferred one. Here is the a 
guide to the choice (in decreasing order of speed): (1) if you see an entry 
that matches your video card, choose that; (2) if your video card supports 
'XV', choose that (use 'xvinfo' to know). You should read 
/usr/share/doc/mplayer-doc/HTML/en/devices.html (it is in package 
'mplayer-doc')."
+msgstr ""
+"MPlayer kan een erg veel verschillende video-uitvoerstuurprogramma's 
gebruiken; het probeert om het beste beschikbare stuurprogramma te gebruiken, 
maar u kunt het door u verkozen altijd kiezen. Hou voor deze keuze het volgende 
in gedachten:\n"
+"(1) Als u een ingang ziet die overeenkomt met uw beeldkaart, dan kiest u deze 
normaal ook.\n"
+"(2) Als uw beeldkaart 'XV' ondersteund, kiest u best die optie (u kunt dit 
nagaan met het commando 'xvinfo').\n"
+"Meer informatie vindt u in het bestand 
'/usr/share/doc/mplayer-doc/HTML/en/devices.html (hiervoor dient u het pakket 
'mplayer-doc' geïnstalleerd te hebben."
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:6001
+msgid "How to download binary codecs"
+msgstr "Hoe binaire codecs te downloaden:"
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:6001
+msgid "MPlayer supports most codecs out of the box and the rest with the help 
of binary codecs. Binary codecs are only necessary for Real 3.0  and 4.0, 
Windows Media 9, QuickTime audio and some very obscure codecs. Debian cannot 
distribute these codecs, but these are available on the internet for download. 
Run the script `/usr/share/mplayer/scripts/binary_codecs.sh' to install those  
made available from MPlayer web site."
+msgstr "MPlayer ondersteund de meeste codecs meteen na installatie, voor 
ondersteuning van andere codecs zijn binaire codecs nodig. Binaire codecs zijn 
normaal enkel nodig voor Real 3.0, Real 4.0, Windows Media 9, Quicktime audio, 
en sommige heel obscure codecs. Debian kan deze codecs om legale redenen niet 
aanbieden, maar daar deze codecs wel beschikbaar zijn op het internet bevat dit 
pakket het script '/usr/share/mplayer/scripts/binary_codecs.sh'. Dit script 
haalt de codecs voor u op van internet en zet ze op de juiste plek neer."
+
+#. Type: string
+#. Description
+#: ../mplayer.templates:7001
+msgid "DVD device name:"
+msgstr "DVD-apparaatnaam:"
+
+#. Type: string
+#. Description
+#: ../mplayer.templates:7001
+msgid "What is the name of your DVD device (if any):"
+msgstr "Wat is de naam van uw DVD-apparaat (indien aanwezig):"
+
+#. Type: select
+#. Description
+#: ../mplayer.templates:8001
+msgid "MPlayer OSD font:"
+msgstr "Lettertype voor MPlayer 'Op het scherm'-weergave:"
+
+#. Type: select
+#. Description
+#: ../mplayer.templates:8001
+msgid " MPlayer needs True Type fonts for On Screen Display. Choose your 
favorite."
+msgstr "MPlayer maakt gebruik van 'TrueType'-lettertypes voor 'Op het 
scherm'-weergave. Welk lettertype verkiest u?"
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:9001
+msgid "MPlayer cannot find TrueType Fonts"
+msgstr "MPlayer kan geen 'TrueType'-lettertype vinden"
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:9001
+msgid "You should install a package providing truetype fonts (such as   
'ttf-freefont' or 'ttf-bitstream-vera' or  'msttcorefonts' ) and reconfigure 
MPlayer (with the command \"dpkg-reconfigure mplayer\")"
+msgstr "U kunt best een pakket met 'TrueType'-lettertypes installeeren (bv. 
'ttf-dejavu' of 'ttf-bitstream-vera' of 'msttcorefonts') en vervolgens MPlayer 
herconfigureren (via het commando 'dpkg-reconfigure mplayer')."
+
only in patch2:
unchanged:
--- mplayer-1.0~rc1.orig/loader/dmo/DMO_VideoDecoder.c
+++ mplayer-1.0~rc1/loader/dmo/DMO_VideoDecoder.c
@@ -121,6 +121,7 @@
      
         this->iv.m_bh = malloc(bihs);
         memcpy(this->iv.m_bh, format, bihs);
+       this->iv.m_bh->biSize = bihs;
 
         this->iv.m_State = STOP;
         //this->iv.m_pFrame = 0;
only in patch2:
unchanged:
--- mplayer-1.0~rc1.orig/loader/dshow/DS_VideoDecoder.c
+++ mplayer-1.0~rc1/loader/dshow/DS_VideoDecoder.c
@@ -116,6 +116,7 @@
      
         this->iv.m_bh = malloc(bihs);
         memcpy(this->iv.m_bh, format, bihs);
+        this->iv.m_bh->biSize = bihs;
 
         this->iv.m_State = STOP;
         //this->iv.m_pFrame = 0;
only in patch2:
unchanged:
--- mplayer-1.0~rc1.orig/mp3lib/sr1.c
+++ mplayer-1.0~rc1/mp3lib/sr1.c
@@ -314,7 +314,10 @@
  */
 LOCAL int read_frame(struct frame *fr){
   unsigned long newhead;
-  unsigned char hbuf[8];
+  union {
+    unsigned char buf[8];
+    unsigned long dummy; // for alignment
+  } hbuf;
   int skipped,resyncpos;
   int frames=0;
 
@@ -324,7 +327,7 @@
 
   set_pointer(512);
   fsizeold=fr->framesize;       /* for Layer3 */
-  if(!stream_head_read(hbuf,&newhead)) return 0;
+  if(!stream_head_read(hbuf.buf,&newhead)) return 0;
   if(!decode_header(fr,newhead)){
     // invalid header! try to resync stream!
 #ifdef DEBUG_RESYNC
@@ -332,7 +335,7 @@
 #endif
 retry1:
     while(!decode_header(fr,newhead)){
-      if(!stream_head_shift(hbuf,&newhead)) return 0;
+      if(!stream_head_shift(hbuf.buf,&newhead)) return 0;
     }
     resyncpos=MP3_fpos-4;
     // found valid header
@@ -342,14 +345,14 @@
     if(!stream_read_frame_body(fr->framesize)) return 0; // read body
     set_pointer(512);
     fsizeold=fr->framesize;       /* for Layer3 */
-    if(!stream_head_read(hbuf,&newhead)) return 0;
+    if(!stream_head_read(hbuf.buf,&newhead)) return 0;
     if(!decode_header(fr,newhead)){
       // invalid hdr! go back...
 #ifdef DEBUG_RESYNC
       printf("INVALID\n");
 #endif
 //      mp3_seek(resyncpos+1);
-      if(!stream_head_read(hbuf,&newhead)) return 0;
+      if(!stream_head_read(hbuf.buf,&newhead)) return 0;
       goto retry1;
     }
 #ifdef DEBUG_RESYNC

signature.asc
Description: OpenPGP digital signature