Merge svn changes up to r26510

r26469 and r26470 (which revert files to inferior versions "because
it's policy") are ignored.

Changelog

@@ -7,6 +7,7 @@ MPlayer (1.0)
     * Support for DTS WAV/DTS-CD passthrough by ad_hwac3
     * Apple's raw YUV2 in MOV
     * LATM over LOAS AAC decoding via internal libfaad2
+    * Video game codecs: BFI video
 
     Demuxers:
     * -lavfdopts cryptokey allows decrypting MXF and ASF files

DOCS/man/fr/mplayer.1

@@ -1,4 +1,4 @@
-.\" synced with r26019
+.\" synced with r26460
 .\" Encoding: iso-8859-1
 .\" MPlayer (C) 2000-2008 MPlayer Team
 .\" The English man page was/is done by Gabucino, Diego Biurrun, Jonas Jermann
@@ -302,7 +302,7 @@ Saute au d
 .IPs "D (\-vo xvmc, \-vf yadif et \-vf kerndeint uniquement)"
 Active/désactive le désentrelacement.
 .IPs "A"
-Bascule entre les angles du DVD.
+Bascule entre les angles du DVD disponibles.
 .RE
 .PD 1
 .PP
@@ -684,6 +684,10 @@ La variable d'environnment MPLAYER_CHARSET vous permettra de ne plus subir
 la troncature des premières lignes affichées.
 .
 .TP
+.B \-msgcolor
+Colorise la sortie console dans les terminaux supportant les couleurs ANSI.
+.
+.TP
 .B \-msglevel <all=<niveau>:<module>=<niveau>:...>
 Contrôle directement le niveau de verbosité de chaque module.
 Le module 'all' change le niveau de verbosité de tous les modules
@@ -726,6 +730,32 @@ niveau de debug 4
 .PD 1
 .
 .TP
+.B \-msgmodule
+Préfixe les messages console du nom du module concerné.
+.
+.TP
+.B \-noconfig <options>
+Ne tient pas compte des fichiers de configuration donnés.
+.br
+.I NOTE\ :
+Si les options \-include ou \-use\-filedir\-conf sont donnés en ligne de commande,
+elles seront honorées.
+.sp 1
+Les options disponibles sont\ :
+.PD 0
+.RSs
+.IPs "all\ \ "
+tous les fichiers de configuration
+.IPs "gui (GUI uniquement)"
+le fichier de l'interface graphique (GUI)
+.IPs system
+la configuration du système
+.IPs "user\ "
+la configuration de l'utilisateur
+.RE
+.PD 1
+.
+.TP
 .B "\-quiet\ "
 Avec cette option, la ligne d'état (c-a-d A:   0.7 V:   0.6 A-V:  0.068 ...) ne
 sera pas affichée.
@@ -880,7 +910,7 @@ Actuellement les pilotes suivants fonctionnent avec fixed-vo: gl, gl2, mga,
 svga, x11, xmga, xv, xvidix et dfbmga.
 .
 .TP
-.B \-framedrop (voir aussi \-hardframedrop, ne fonctionne qu'avec \-no-correct-pts)
+.B \-framedrop (voir aussi \-hardframedrop, expérimental sans \-no\-correct\-pts)
 Saute l'affichage de certaines trames pour maintenir la synchro A/V sur
 les machines lentes.
 Les filtres vidéo ne sont pas appliqués sur de telles trames.
@@ -901,7 +931,7 @@ Ne fonctionne pas en tant qu'option de fichier de configuration.
 Affiche un court résumé des options.
 .
 .TP
-.B \-hardframedrop (ne fonctionne qu'avec \-no-correct-pts)
+.B \-hardframedrop (expérimental sans \-no\-correct\-pts)
 Saute les trames de façon plus brutale (casse le décodage).
 Mène à des distorsions d'image!
 .
@@ -939,6 +969,7 @@ Dans certains cas, vous aurez encore plus d'informations en utilisant
 \-msglevel identify=6.
 Par exemple, pour les DVDs, cela listera la durée de chaque titre et de
 chaque chapitre, tout comme le numéro d'identifiant du DVD.
+Ajoutez l'option \-frames 0 pour supprimer toute sortie console superflue.
 Le script TOOLS/\:midentify supprime le reste de l'affichage et (espérons-le)
 formate les noms de fichiers pour le shell.
 .
@@ -6289,7 +6320,7 @@ p(x,y)\ : retourne la valeur du pixel de coordonn
 Génère divers motifs de test.
 .
 .TP
-.B rgbtest
+.B rgbtest[=largeur:hauteur]
 Génère un motif de test RGB utile pour détecter les problèmes entre RGB BGR.
 Vous devriez voir une frise rouge, verte et bleue du haut vers le bas.
 .RSs
@@ -8236,8 +8267,10 @@ Algorithme de d
 macro-block dans tous les modes et choisit le meilleur.
 C'est lent mais permet d'améliorer la qualité visuelle et réduire la taille 
 du fichier.
-Quand mbd est mis à 1 ou 2, la valeur de de mbcmp est ingnoré quand les
+Quand mbd est mis à 1 ou 2, la valeur de de mbcmp est ignoré quand les
-macro-blocks sont comparés entre eux.
+macro-blocks sont comparés entre eux (la valeur de mbcmp reste utilisée dans
+d'autres endroits, en particulier dans les algorithmes de recherche de
+mouvement).
 En revanche, si l'une des options de comparaisons (precmp, subcmp, cmp, or
 mbcmp) n'est pas à zéro, une recherche de mouvement half-pel plus lente et
 de meilleure qualité est utilisée, quel que soit la valeur de mbd.
@@ -9115,6 +9148,8 @@ Cela ne semble utile que pour les encodages
 .B mbcmp=<0\-2000>
 Choisit la fonction de comparaison pour décider du meilleur du macroblock
 à coder, n'a d'effet que si mbd=0.
+Est aussi utilisé dans certaines fonctions de recherche de mouvement, auquel cas
+a un effet quelquesoit la valeur de mbd.
 .PD 0
 .RSs
 .IPs "0 (SAD)"
@@ -11003,7 +11038,10 @@ NUT open container format (exp
 .IPs "mov\ \ "
 QuickTime
 .IPs "mp4\ \ "
-MPEG-4 format
+format MPEG-4
+.IPs "ipod\ "
+format MPEG-4 avec les drapeaux supplémentaires requis par les micrologiciels
+(firmware) des iPods d'Apple
 .IPs "dv\ \ \ "
 Sony Digital Video container
 .RE

DOCS/man/hu/mplayer.1

@@ -1,4 +1,4 @@
-.\" Synced with r26297
+.\" Synced with r26460
 .\" MPlayer (C) 2000-2008 MPlayer Team
 .\" Ezt a man oldalt Gabucino, Diego Biurrun és Jonas Jermann készíti/készítette
 .\" Karbantartó: Gabrov
@@ -33,7 +33,7 @@
 .\" Név
 .\" --------------------------------------------------------------------------
 .
-.TH MPlayer 1 "2008. 04. 05." "MPlayer Project" "A film lejátszó"
+.TH MPlayer 1 "2008. 04. 21." "MPlayer Project" "A film lejátszó"
 .
 .SH NÉV
 mplayer  \- film lejátszó
@@ -649,6 +649,10 @@ Ez csak a parancssor
 Az MPLAYER_CHARSET környezeti változóval szabadulhatsz meg az első
 sorok elrontott kimenetétől.
 
+.
+.TP
+.B \-msgcolor
+Engedélyezi a színes konzol kimenetet az ANSI színeket támogató terminálokon.
 .
 .TP
 .B \-msglevel <all=<szint>:<module>=<szint>:...>
@@ -691,6 +695,32 @@ b
 .PD 1
 .
 .TP
+.B \-msgmodule
+Minden egyes konzol üzenet elé beilleszti a modul nevét.
+.
+.TP
+.B \-noconfig <opciók>
+Ne értelmezze a kiválaszott konfigurációs fájlokat.
+.br
+.I MEGJEGYZÉS:
+Ha a \-include vagy \-use\-filedir\-conf opciók adottak a
+parancssorban, figyelembe lesznek véve.
+.sp 1
+Elérhető opciók:
+.PD 0
+.RSs
+.IPs "all\ \ "
+minden konfigurációs fájl
+.IPs "gui (csak GUI)"
+GUI konfigurációs fájl
+.IPs system
+rendszer konfigurációs fájl
+.IPs "user\ "
+felhasználói konfigurációs fájl
+.RE
+.PD 1
+.
+.TP
 .B "\-quiet\ "
 Hatására a konzoli kimeneti sorok kevésbé lesznek beszédesek;
 alaphelyzetben megakadályozza, hogy a státuszsor
@@ -3227,6 +3257,7 @@ m
 .TP
 .B \-zrbw (csak \-vo zr)
 Fekete fehér lejátszás.
+Az optimális teljesítményhez kombinálható a '\-lavdopts gray' kapcsolóval.
 .
 .TP
 .B \-zrcrop <[szélesség]x[magasság]+[x offszet]+[y offszet]> (csak \-vo zr)
@@ -4316,7 +4347,7 @@ T
 .I PÉLDA:
 .PD 0
 .RSs
-\-lavdopts skiploopfilter=all:skipframe=nonref
+\-lavdopts gray:skiploopfilter=all:skipframe=nonref
 .RE
 .PD 1
 .sp 1
@@ -4419,6 +4450,8 @@ hib
 kompenzáció, az alapértelmezett kvantálási mátrix feltételezett használata,
 YUV 4:2:0 feltételezése és még néhány ellenőrzés kihagyása a hibás bitfolyamok
 megtalálására.
+.IPs "gray\ "
+csak fekete-fehér dekódolás (egy kicsit gyorsabb, mint színekkel)
 .IPs "idct=<0\-99> (lásd \-lavcopts)"
 A legjobb dekódolási minőségért használd ugyan azt az IDCT algoritmust a
 dekódoláshoz és a kódoláshoz. Bár az alaposság ezzel kicsit romolhat.
@@ -8357,6 +8390,10 @@ j
 darabolt, struktúrált mód H.263+-hoz
 .
 .TP
+.B "gray\ \ \ "
+csak fekete-fehér kódolás (gyorsabb)
+.
+.TP
 .B vfdct=<0\-10>
 DCT algoritmus
 .PD 0

DOCS/man/zh/mplayer.1

@@ -1,4 +1,4 @@
-.\" sync with en/mplayer.1 r26057
+.\" sync with en/mplayer.1 r26460
 .\" Encoding: UTF-8
 .\" Reminder of hard terms which need better/final solution later: 
 .\"   /capture; playtree in parent list; colorkey; retrace; desync; downmix;
@@ -286,8 +286,10 @@ MPlayer 有个完全可配置的, 命令驱动的控制层,
 用 OSD 显示文件名。
 .IPs "! 和 @"
 寻到前一章节/后一章节的开始处。
-.IPs "D (仅用于\-vo xvmc, \-vf yadif, \-vf kerndeint)"
+.IPs "D（仅用于\-vo xvmc, \-vf yadif, \-vf kerndeint）"
-激活/撤销去交错。
+激活/禁用解隔行扫描过滤器。
+.IPs "A"
+在可用的 DVD 视角间循环切换。
 .RE
 .PD 1
 .PP
@@ -634,6 +636,10 @@ lavcopts=mbd=2:trell=yes:v4mv=yes
 环境变量 MPLAYER_CHARSET 能帮你去除开头几行混乱的输出。
 .
 .TP
+.B \-msgcolor
+在支持 ANSI 彩色标准的终端上启用彩色控制屏幕。
+.
+.TP
 .B \-msglevel <all=<级别>:<模块>=<级别>:...>
 直接对各个模块控制冗赘度。
 此 "all" 模块改变所有模块(虽然没有在命令行中显式指定)的冗赘级别。
@@ -672,6 +678,32 @@ lavcopts=mbd=2:trell=yes:v4mv=yes
 .PD 1
 .
 .TP
+.B \-msgmodule
+在每条控制屏幕消息前加上模块名。
+.
+.TP
+.B \-noconfig <若干选项>
+不解析所选的配置文件。
+.br
+.I 注意：
+如果命令行中指定了 \-include 或 \-use\-filedir\-conf 选项，
+那么这些选项将优先生效。
+.sp 1
+可用选项有：
+.PD 0
+.RSs
+.IPs "all\ \ "
+所有的配置文件
+.IPs "gui（仅仅是 GUI）"
+GUI 的配置文件
+.IPs system
+系统配置文件
+.IPs "user\ "
+用户配置文件
+.RE
+.PD 1
+.
+.TP
 .B "\-quiet\ "
 使得控制台消息少输出; 特别地, 阻止状态行
 (即 A:   0.7 V:   0.6 A-V:  0.068 ...)的显示。
@@ -801,7 +833,7 @@ MOUSE_BTN0\-MOUSE_BTN0_DBL。
 xv, xvidix 和 dfbmga。
 .
 .TP
-.B \-framedrop（也请参见 \-hardframedrop，只能与 -no-correct-pts 一起使用）
+.B \-framedrop（也请参见 \-hardframedrop，未指定 -no-correct-pts 时只可用于实验）
 跳过显示一些帧从而在慢的机器上保持 A/V 同步。
 视频滤镜不会应用到这些帧上。对于 B-帧 甚至解码也完全跳过。
 .
@@ -815,7 +847,7 @@ xv, xvidix 和 dfbmga。
 显示简短的选项概要。
 .
 .TP
-.B \-hardframedrop（只能与 -no-correct-pts 一起使用）
+.B \-hardframedrop（未指定 -no-correct-pts 时只可用于实验）
 更加密集的丢帧（中断解码过程）。将导致图像失真！
 注意，libmpeg2 解码器尤其可能在使用该选项后崩溃，所以请考虑使用
 “\-vc ffmpeg12,”。
@@ -841,12 +873,13 @@ mplayer \-heartbeat\-cmd "gnome\-screensaver\-command \-p" file
 .
 .TP
 .B \-identify
-是 \-msglevel identify=4 的简式。使用易于分析的格式显示文件参数。
+是 \-msglevel identify=4 的简写形式。使用便于解析的格式显示文件参数。
-也打印更详细的字幕信息和音轨语言和 ID。
+同时打印更为详细的关于字幕和音轨的语言与 ID 号的信息。
-在某些情形下, 你使用 \-msglevel identify=6 能得到更多的信息。
+在某些情形下，使用 \-msglevel identify=6 能得到更多的信息。
-例如, 对于 DVD 能列出每个标题的章节和时长，以及一个碟片 ID 号。
+例如，对于一张 DVD 碟片，该选项能列出每个标题的章节和时长，以及一个碟片 ID 号。
-wrapper(封套) 脚本 TOOLS/\:midentify 能抑制 MPlayer 的其它输出
+将此选项与 \-frames 0 一起使用能禁止所有输出。
-并(希望能) shellescapes(脚本转义) 文件名。
+封装脚本 TOOLS/\:midentify 禁止 MPlayer 的其它输出，
+并且（很可能）shellescapes（脚本转义）了文件名。
 .
 .TP
 .B \-idle (也请参见 \-slave)
@@ -7316,10 +7349,11 @@ iter（递归重叠的区块，仅用于snow）
 .B mbd=<0\-2>（另参见*cmp、qpel）
 宏块决策算法（高质量模式），将每个宏块在所有的模式下编码然后选择最佳的模式。
 该模式运行很慢，但能使质量提高，文件大小降低。
-当mbd设为1或2时，比较宏块过程中将不考虑mbcmp的值。
+当 mbd 设为1或2时，比较宏块过程中将不考虑 mbcmp 的值（但是其它地方还是使用
-然而当某个比较设置（precmp、subcmp、cmp或mbcmp）为非零值时，将会使用一种更慢但更
+了 mbcmp 值，特别是运动搜索算法中）。
-好的半像素运动搜索模式，而不管mbd设为何值。
+然而当某个比较设置（precmp、subcmp、cmp 或 mbcmp）为非零值时，将会使用一种更慢但更
-如果设置了qpel参数，则将肯定使用四分之一像素运动搜索模式。
+好的半像素运动搜索模式，而不管 mbd 设为何值。
+如果设置了 qpel 参数，则将肯定使用四分之一像素运动搜索模式。
 .PD 0
 .RSs
 .IPs 0
@@ -8107,7 +8141,8 @@ vlc编码（Golomb-Rice）
 .
 .TP
 .B mbcmp=<0\-2000>
-设置用于宏块决策的比较函数，只有当mbd=0时才有作用。
+设置用于宏块决策的比较函数，只有当 mbd=0 时才有作用。
+该选项也用于一些运动搜索函数中，此时不管 mbd 设置如何它都有作用。
 .PD 0
 .RSs
 .IPs "0 (SAD)"
@@ -9727,8 +9762,10 @@ NUT开放容器格式（实验性）
 QuickTime
 .IPs "mp4\ \ "
 MPEG-4格式
+.IPs "ipod\ "
+含有苹果 iPod 固件所需额外标志数据的 MPEG-4 格式
 .IPs "dv\ \ \ "
-Sony数字视频容器格式
+Sony 数字视频容器格式
 .RE
 .PD 1
 .TP

DOCS/xml/Makefile.inc

@@ -30,7 +30,6 @@ endif
 HTML_STYLESHEET ?= ../default.css
 
 # This is the main target...
-.PHONY: all html-chunked html-single xmllint
 all: html-chunked html-single
 html-chunked: $(HTMLDIR)/index.html
 html-single: $(HTMLFILE)
@@ -77,3 +76,5 @@ $(filter-out main.xml, $(patsubst ../en/%,%, $(wildcard ../en/*.xml))):
 distclean:
 	rm -f main.xml
 	rm -f `find *.xml -type l`;
+
+.PHONY: all html-chunked html-single xmllint distclean

DOCS/xml/en/encoding-guide.xml

@@ -2244,6 +2244,23 @@ mencoder dvd://1 -oac copy -vf pullup,softskip
     -ovc lavc -ofps 24000/1001<!--
   --></screen>
 </para></listitem>
+<listitem><para>
+  <option>-vf filmdint</option> is similar to
+  <option>-vf pullup</option>: both filters attempt to match a pair of
+  fields to form a complete frame. <option>filmdint</option> will
+  deinterlace individual fields that it cannot match, however, whereas
+  <option>pullup</option> will simply drop them. Also, the two filters
+  have separate detection code, and filmdint may tend to match fields a
+  bit less often. Which filter works better may depend on the input
+  video and personal taste; feel free to experiment with fine-tuning
+  the filters' options if you encounter problems with either one (see
+  the man page for details). For most well-mastered input video,
+  however, both filters work quite well, so either one is a safe choice
+  to start with.
+  <screen>
+mencoder dvd://1 -oac copy -vf filmdint -ovc lavc -ofps 24000/1001<!--
+  --></screen>
+</para></listitem>
 <listitem><para>
   An older method
   is to, rather than inverse-telecine the telecined parts, telecine
@@ -2258,18 +2275,6 @@ mencoder dvd://1 -oac copy -vf softpulldown,ivtc=1 -ovc lavc -ofps 24000/1001
   </screen>
 </para></listitem>
 
-<listitem><para>
-  I have not used <option>-vf filmdint</option> myself, but here is what
-  D Richard Felker III has to say:
-
-  <blockquote><para>It is OK, but IMO it tries to deinterlace rather
-     than doing inverse telecine too often (much like settop DVD
-     players &amp; progressive TVs) which gives ugly flickering and
-     other artifacts. If you are going to use it, you at least need to
-     spend some time tuning the options and watching the output first
-     to make sure it is not messing up.
-  </para></blockquote>
-</para></listitem>
 </itemizedlist>
 </sect3>
 

DOCS/xml/hu/encoding-guide.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- synced with r26287 -->
+<!-- synced with r26474 -->
 <chapter id="encoding-guide">
 <title>Kódolás a <application>MEncoder</application>rel</title>
 
@@ -1789,7 +1789,7 @@ a telecine.
 <formalpara>
 <title>Megjegyzés a számokhoz.</title>
 <para>
-Sok dokumentáció, beleértve a fent belinkeltet is, az NTSC videó mező
+Sok dokumentáció, beleértve a fent belinkelt cikket is, az NTSC videó mező
 per másodperc értékét 59.94-ként határozza meg, és a megfelelő képkocka
 per másodperc értéket 29.97-nek (telecine-s és átlapolt) és 23.976-nak
 írja (progresszív). Az egyszerűség kedvéért sok dokumentáció még ezeket
@@ -1870,7 +1870,9 @@ kockáról kockára mutatja meg, mezőről mezőre történő lejátszás helyet
   írva. Csak a legalapvetőbb dolgokat mutatják, ami a megfelelő kategóriába
   tartozó videók kódolásához szükséges. A jó DVD rip-ek készítése vagy a
   <systemitem class="library">libavcodec</systemitem> finomhangolása a
-  maximális minőség eléréséhez nem tartozik ezen dokumentum célkitűzései közé.
+  maximális minőség eléréséhez nem tartozik ezen fejezet célkitűzései közé,
+  nézd meg a <link linkend="encoding-guide">MEncoder kódolási útmutató</link>
+  többi részét.
 </para></listitem>
 <listitem><para>
   Sok megjegyzés vonatkozik erre a leírásra, melyek így vannak jelölve:
@@ -2147,7 +2149,7 @@ felépítéséhez (ennek vannak hátrányai - lásd a 3. módszert).
 <listitem><para>
   Sajnos ez a kapcsoló hibás a <application>MEncoder</application>ben;
   talán a <application>MEncoder G2</application>-vel működni fog,
-  de itt most még nem. Belefuthatsz fagyásokba. Egyébként a <option> -vf
+  de itt most még nem. Fagyásokat tapasztalhatsz. Egyébként a <option> -vf
   tfields</option> célja az lenne, hogy teljes képkockát készít
   mindegyik mezőből, ami miatt a frameráta 60000/1001 lesz. Ennek a
   megközelítésnek az az előnye, hogy soha nincs adatvesztés; habár
@@ -2219,7 +2221,23 @@ mencoder dvd://1 -oac copy -vf pullup,softskip
   --></screen>
 </para></listitem>
 <listitem><para>
-  A másik módszer, a telecine-s részek inverz-telecine-lése
+  A <option>-vf filmdint</option> hasonló a
+  <option>-vf pullup</option>-hoz: mindkét szűrő megpróbálja egyeztetni a
+  mezőpárokat, hogy azok egy komplett képkockát adjanak. A <option>filmdint</option>
+  deinterlace-lni fogja az egyedi mezőket, amelyeket nem tud egyeztetni,
+  míg a <option>pullup</option> egyszerűen csak eldobja őket. A két szűrő
+  különböző detektáló kódot alkalmaz és a filmdint néha túl kevés mezőt
+  egyeztet. Az, hogy melyik szűrő a jobb, a bemeneti videótól és az egyéni
+  ízléstől függ; kísérletezz szabadon a szűrők opcióinak finomhangolásával,
+  ha valamelyikkel problémád van (lásd a man oldalt a részletekért).
+  A legtöbb jól elkészített bemeneti videónál mindkettő eléggé jól működik,
+  így bármelyik jó választás lehet a kezdéshez.
+  <screen>
+mencoder dvd://1 -oac copy -vf filmdint -ovc lavc -ofps 24000/1001<!--
+  --></screen>
+</para></listitem>
+<listitem><para>
+  A régebbi módszer, a telecine-s részek inverz-telecine-lése
   helyett a nem-telecine-s részek telecine-lése majd a teljes
   videó inverz-telecine-lése. Zavarosan hangzik? A softpulldown
   egy olyan szűrő, ami végigmegy a videón és a teljes fájlt
@@ -2232,18 +2250,6 @@ mencoder dvd://1 -oac copy -vf softpulldown,ivtc=1 -ovc lavc -ofps 24000/1001
   </screen>
 </para></listitem>
 
-<listitem><para>
-  Én magam nem használtam a <option>-vf filmdint</option>-et, de álljon itt
-  D Richard Felker III hozzászólása:
-
-  <blockquote><para>Rendben, de IMO inkább deinterlace-t próbálj
-	 a túl gyakori inverz telecine helyett (inkább settop DVD
-     lejátszók &amp; progresszív TV-k) ami csúnya vibrálást és egyéb
-     jelenségeket okoz. Ha használni akarod, el kell töltened egy kis
-     időt az opciók próbálgatásával és az eredmény megfigyelésével,
-     hogy biztos légy benne, nem rontja el az egészet.
-  </para></blockquote>
-</para></listitem>
 </itemizedlist>
 </sect3>
 

Makefile

@@ -60,10 +60,15 @@ SRCS_COMMON = asxparser.c \
               libaf/format.c \
               libaf/reorder_ch.c \
               libaf/window.c \
+              libvo/aclib.c \
+              libvo/osd.c \
+              libvo/sub.c \
               osdep/$(GETCH) \
               osdep/$(TIMER) \
               talloc.c
 
+SRCS_COMMON-$(BITMAP_FONT)           += libvo/font_load.c
+SRCS_COMMON-$(FREETYPE)              += libvo/font_load_ft.c
 SRCS_COMMON-$(HAVE_SYS_MMAN_H)       += osdep/mmap_anon.c
 SRCS_COMMON-$(HAVE_SYS_MMAN_H)       += libaf/af_export.c
 SRCS_COMMON-$(LADSPA)                += libaf/af_ladspa.c
@@ -88,6 +93,21 @@ SRCS_COMMON-$(NEED_SHMEM)            += osdep/shmem.c
 SRCS_COMMON-$(NEED_STRSEP)           += osdep/strsep.c
 SRCS_COMMON-$(NEED_SWAB)             += osdep/swab.c
 SRCS_COMMON-$(NEED_VSSCANF)          += osdep/vsscanf.c
+SRCS_COMMON-$(TREMOR_INTERNAL)       += tremor/bitwise.c \
+                                        tremor/block.c \
+                                        tremor/codebook.c \
+                                        tremor/floor0.c \
+                                        tremor/floor1.c \
+                                        tremor/framing.c \
+                                        tremor/info.c \
+                                        tremor/mapping0.c \
+                                        tremor/mdct.c \
+                                        tremor/registry.c \
+                                        tremor/res012.c \
+                                        tremor/sharedbook.c \
+                                        tremor/synthesis.c \
+                                        tremor/window.c \
+
 SRCS_COMMON-$(UNRAR_EXEC)            += unrar_exec.c
 
 SRCS_MPLAYER = mplayer.c \
@@ -98,6 +118,20 @@ SRCS_MPLAYER = mplayer.c \
                parser-mpcmd.c \
                command.c \
                input/input.c \
+               libao2/audio_out.c \
+               libao2/ao_mpegpes.c \
+               libao2/ao_null.c \
+               libao2/ao_pcm.c \
+               $(addprefix libao2/,$(AO_SRCS)) \
+               libvo/aspect.c \
+               libvo/geometry.c \
+               libvo/old_vo_wrapper.c \
+               libvo/spuenc.c \
+               libvo/video_out.c \
+               libvo/vo_mpegpes.c \
+               libvo/vo_null.c \
+               libvo/vo_yuv4mpeg.c \
+               $(addprefix libvo/,$(VO_SRCS)) \
 
 SRCS_MPLAYER-$(APPLE_REMOTE) += input/ar.c
 SRCS_MPLAYER-$(GUI_GTK)      += gui/app.c \
@@ -152,6 +186,8 @@ SRCS_MPLAYER-$(LIBMENU)      += libmenu/menu.c \
 SRCS_MPLAYER-$(LIBMENU_DVBIN) += libmenu/menu_dvbin.c
 SRCS_MPLAYER-$(LIRC)         += input/lirc.c
 
+SRCS_MPLAYER-$(VIDIX)         += libvo/vosub_vidix.c
+
 OBJS_MPLAYER-$(PE_EXECUTABLE) += osdep/mplayer-rc.o
 
 SRCS_MENCODER = mencoder.c \
@@ -163,25 +199,20 @@ COMMON_LIBS = libmpcodecs/libmpcodecs.a \
               libmpdemux/libmpdemux.a \
               stream/stream.a \
               libswscale/libswscale.a \
-              libvo/libosd.a \
 
 COMMON_LIBS-$(LIBAVFORMAT_A)      += libavformat/libavformat.a
 COMMON_LIBS-$(LIBAVCODEC_A)       += libavcodec/libavcodec.a
 COMMON_LIBS-$(LIBAVUTIL_A)        += libavutil/libavutil.a
 COMMON_LIBS-$(LIBPOSTPROC_A)      += libpostproc/libpostproc.a
-COMMON_LIBS-$(WIN32DLL)           += loader/libloader.a
+COMMON_LIBS-$(WIN32DLL)           += loader/loader.a
-COMMON_LIBS-$(MP3LIB)             += mp3lib/libmp3.a
+COMMON_LIBS-$(MP3LIB)             += mp3lib/mp3lib.a
 COMMON_LIBS-$(LIBA52)             += liba52/liba52.a
 COMMON_LIBS-$(LIBMPEG2)           += libmpeg2/libmpeg2.a
 COMMON_LIBS-$(FAAD_INTERNAL)      += libfaad2/libfaad2.a
-COMMON_LIBS-$(TREMOR_INTERNAL)    += tremor/libvorbisidec.a
+COMMON_LIBS-$(DVDREAD_INTERNAL)   += dvdread/dvdread.a
-COMMON_LIBS-$(DVDREAD_INTERNAL)   += dvdread/libdvdread.a
 COMMON_LIBS-$(DVDCSS_INTERNAL)    += libdvdcss/libdvdcss.a
 
-LIBS_MPLAYER = libvo/libvo.a \
+LIBS_MPLAYER-$(VIDIX)             += vidix/vidix.a
-               libao2/libao2.a \
-
-LIBS_MPLAYER-$(VIDIX)             += vidix/libvidix.a
 
 LIBS_MENCODER = libmpcodecs/libmpencoders.a \
                 libmpdemux/libmpmux.a \
@@ -204,7 +235,6 @@ INSTALL_TARGETS             += $(INSTALL_TARGETS-yes)
 
 PARTS = dvdread \
         liba52 \
-        libao2 \
         libavcodec \
         libavformat \
         libavutil \
@@ -215,13 +245,14 @@ PARTS = dvdread \
         libmpeg2 \
         libpostproc \
         libswscale \
-        libvo \
-        loader \
         mp3lib \
         stream \
-        tremor \
         vidix \
 
+ifdef ARCH_X86
+PARTS += loader
+endif
+
 DIRS =  gui \
         gui/mplayer \
         gui/mplayer/gtk \
@@ -230,11 +261,18 @@ DIRS =  gui \
         gui/win32 \
         input \
         libaf \
+        libao2 \
         libass \
         libmenu \
+        libvo \
         osdep \
+        tremor \
+        TOOLS \
 
-all:	$(ALL_PRG)
+all:	recurse $(ALL_PRG)
+
+recurse:
+	for part in $(PARTS); do $(MAKE) -C $$part; done
 
 DEPS = $(SRCS_COMMON:.c=.d) $(SRCS_MPLAYER:.c=.d) $(SRCS_MENCODER:.c=.d)
 $(DEPS): help_mp.h version.h codecs.conf.h
@@ -245,72 +283,19 @@ include mpcommon.mak
 
 CFLAGS := $(subst -I..,-I.,$(CFLAGS))
 
-dvdread/libdvdread.a: dvdread/*.[ch]
+define RECURSIVE_RULE
-	$(MAKE) -C dvdread
+$(part)/$(part).a:
+	$(MAKE) -C $(part)
+endef
 
-liba52/liba52.a: liba52/*.[ch]
+$(foreach part,$(PARTS),$(eval $(RECURSIVE_RULE)))
-	$(MAKE) -C liba52
 
-libao2/libao2.a: libao2/*.[ch]
+libmpcodecs/libmpencoders.a:
-	$(MAKE) -C libao2
-
-libavcodec/libavcodec.a: libavcodec/*.[ch] libavcodec/*/*.[chS]
-	$(MAKE) -C libavcodec
-
-libavformat/libavformat.a: libavformat/*.[ch]
-	$(MAKE) -C libavformat
-
-libavutil/libavutil.a: libavutil/*.[ch]
-	$(MAKE) -C libavutil
-
-libdvdcss/libdvdcss.a: libdvdcss/*.[ch] libdvdcss/*/*.[ch]
-	$(MAKE) -C libdvdcss
-
-libfaad2/libfaad2.a: libfaad2/*.[ch] libfaad2/*/*.[ch]
-	$(MAKE) -C libfaad2
-
-libmpcodecs/libmpcodecs.a: libmpcodecs/*.[ch] libmpcodecs/*/*.[ch]
-	$(MAKE) -C libmpcodecs
-
-libmpcodecs/libmpencoders.a: libmpcodecs/*.[ch] libmpcodecs/*/*.[ch]
 	$(MAKE) -C libmpcodecs libmpencoders.a
 
-libmpdemux/libmpdemux.a: libmpdemux/*.[ch]
+libmpdemux/libmpmux.a:
-	$(MAKE) -C libmpdemux libmpdemux.a
-
-libmpdemux/libmpmux.a: libmpdemux/*.[ch]
 	$(MAKE) -C libmpdemux libmpmux.a
 
-libmpeg2/libmpeg2.a: libmpeg2/*.[ch]
-	$(MAKE) -C libmpeg2
-
-libpostproc/libpostproc.a: libpostproc/*.[ch]
-	$(MAKE) -C libpostproc
-
-libswscale/libswscale.a: libswscale/*.[ch]
-	$(MAKE) -C libswscale
-
-libvo/libvo.a: libvo/*.[ch]
-	$(MAKE) -C libvo libvo.a
-
-libvo/libosd.a: libvo/*.[ch]
-	$(MAKE) -C libvo libosd.a
-
-loader/libloader.a: loader/*.[chSs]
-	$(MAKE) -C loader
-
-mp3lib/libmp3.a: mp3lib/*.[ch]
-	$(MAKE) -C mp3lib
-
-stream/stream.a: stream/*.[ch] stream/*/*.[ch]
-	$(MAKE) -C stream
-
-tremor/libvorbisidec.a: tremor/*.[ch]
-	$(MAKE) -C tremor
-
-vidix/libvidix.a: vidix/*.[ch] vidix/*/*.[ch]
-	$(MAKE) -C vidix
-
 mplayer$(EXESUF): $(MPLAYER_DEPS)
 	$(CC) -o $@ $^ $(LDFLAGS_MPLAYER)
 
@@ -390,16 +375,15 @@ uninstall:
 	  fi ; \
 	done
 
-clean::
+clean:: toolsclean
 	-rm -f mplayer$(EXESUF) mencoder$(EXESUF) codec-cfg$(EXESUF) \
 	  codecs2html$(EXESUF) codec-cfg-test$(EXESUF) cpuinfo$(EXESUF) \
 	  codecs.conf.h help_mp.h version.h TAGS tags
 	for part in $(PARTS); do $(MAKE) -C $$part clean; done
-	rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.o /*.a /*.ho /*~, $(addsuffix $(suffix),$(dir))))
+	rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.o /*.ho /*~, $(addsuffix $(suffix),$(dir))))
 
 distclean:: doxygen_clean
 	for part in $(PARTS); do $(MAKE) -C $$part distclean; done
-	$(MAKE) -C TOOLS distclean
 	-rm -f configure.log config.mak config.h
 	rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.d, $(addsuffix $(suffix),$(dir))))
 
@@ -446,4 +430,71 @@ ifneq ($(HELP_FILE),help/help_mp-en.h)
 	@help/help_diff.sh $(HELP_FILE) < help/help_mp-en.h >> help_mp.h
 endif
 
-.PHONY: all install* uninstall strip doxygen
+
+TOOLS = TOOLS/alaw-gen$(EXESUF) \
+        TOOLS/asfinfo$(EXESUF) \
+        TOOLS/avi-fix$(EXESUF) \
+        TOOLS/avisubdump$(EXESUF) \
+        TOOLS/compare$(EXESUF) \
+        TOOLS/dump_mp4$(EXESUF) \
+        TOOLS/movinfo$(EXESUF) \
+        TOOLS/subrip$(EXESUF) \
+
+ifdef ARCH_X86
+TOOLS += TOOLS/modify_reg$(EXESUF)
+endif
+
+tools: $(TOOLS)
+
+TOOLS_COMMON_LIBS = mp_msg.o mp_fifo.o osdep/$(TIMER) osdep/$(GETCH) \
+              -ltermcap -lm
+
+TOOLS/bmovl-test$(EXESUF): TOOLS/bmovl-test.c -lSDL_image
+
+TOOLS/subrip$(EXESUF): TOOLS/subrip.c vobsub.o spudec.o unrar_exec.o \
+  libswscale/libswscale.a libavutil/libavutil.a $(TOOLS_COMMON_LIBS)
+
+TOOLS/vfw2menc$(EXESUF): TOOLS/vfw2menc.c -lwinmm -lole32
+
+#FIXME: Linking is broken, help welcome.
+TOOLS/vivodump$(EXESUF): TOOLS/vivodump.c libmpdemux/libmpdemux.a $(TOOLS_COMMON_LIBS)
+
+fastmemcpybench: TOOLS/fastmemcpybench.c
+	$(CC) $(CFLAGS) $< -o TOOLS/fastmem-mmx$(EXESUF)  -DNAME=\"mmx\"      -DHAVE_MMX
+	$(CC) $(CFLAGS) $< -o TOOLS/fastmem-k6$(EXESUF)   -DNAME=\"k6\ \"     -DHAVE_MMX -DHAVE_3DNOW
+	$(CC) $(CFLAGS) $< -o TOOLS/fastmem-k7$(EXESUF)   -DNAME=\"k7\ \"     -DHAVE_MMX -DHAVE_3DNOW -DHAVE_MMX2
+	$(CC) $(CFLAGS) $< -o TOOLS/fastmem-sse$(EXESUF)  -DNAME=\"sse\"      -DHAVE_MMX -DHAVE_SSE   -DHAVE_MMX2
+	$(CC) $(CFLAGS) $< -o TOOLS/fastmem2-mmx$(EXESUF) -DNAME=\"mga-mmx\"  -DHAVE_MGA -DHAVE_MMX
+	$(CC) $(CFLAGS) $< -o TOOLS/fastmem2-k6$(EXESUF)  -DNAME=\"mga-k6\ \" -DHAVE_MGA -DHAVE_MMX -DHAVE_3DNOW
+	$(CC) $(CFLAGS) $< -o TOOLS/fastmem2-k7$(EXESUF)  -DNAME=\"mga-k7\ \" -DHAVE_MGA -DHAVE_MMX -DHAVE_3DNOW -DHAVE_MMX2
+	$(CC) $(CFLAGS) $< -o TOOLS/fastmem2-sse$(EXESUF) -DNAME=\"mga-sse\"  -DHAVE_MGA -DHAVE_MMX -DHAVE_SSE   -DHAVE_MMX2
+
+REAL_SRCS    = $(wildcard TOOLS/realcodecs/*.c)
+REAL_TARGETS = $(REAL_SRCS:.c=.so.6.0)
+
+realcodecs: $(REAL_TARGETS)
+
+fastmemcpybench realcodecs: CFLAGS += -g
+
+%.so.6.0: %.o
+	ld -shared -o $@ $< -ldl -lc
+
+# FIXME: netstream linking is a mess that should be fixed properly some day.
+# It does not work with either GUI, LIVE555, libavformat, cdparanoia enabled.
+NETSTREAM_DEPS = libmpdemux/libmpdemux.a \
+                 stream/stream.a \
+                 dvdread/libdvdread.a \
+                 libdvdcss/libdvdcss.a \
+                 libavutil/libavutil.a \
+                 m_option.o \
+                 m_struct.o \
+                 $(TOOLS_COMMON_LIBS)
+
+TOOLS/netstream$(EXESUF): TOOLS/netstream.o $(NETSTREAM_DEPS)
+	$(CC) $(CFLAGS) -o $@ $^
+
+toolsclean:
+	rm -f $(TOOLS) TOOLS/fastmem*-* TOOLS/netstream$(EXESUF)
+	rm -f TOOLS/bmovl-test$(EXESUF) TOOLS/vfw2menc$(EXESUF) $(REAL_TARGETS)
+
+.PHONY: all doxygen *install* recurse strip tools

TOOLS/Makefile

@@ -1,71 +0,0 @@
-include ../config.mak
-
-CFLAGS = -I..
-
-OBJS = alaw-gen$(EXESUF) \
-	asfinfo$(EXESUF) \
-	avi-fix$(EXESUF) \
-	avisubdump$(EXESUF) \
-	compare$(EXESUF) \
-	dump_mp4$(EXESUF) \
-	modify_reg$(EXESUF) \
-	movinfo$(EXESUF) \
-	subrip$(EXESUF) \
-#	vivodump$(EXESUF) \
-
-COMMON_LIBS = ../mp_msg.o ../mp_fifo.o ../osdep/$(TIMER) ../osdep/$(GETCH) \
-              -ltermcap -lm
-
-all: $(OBJS)
-
-bmovl-test$(EXESUF): bmovl-test.c -lSDL_image
-
-subrip$(EXESUF): subrip.c ../vobsub.o ../spudec.o ../unrar_exec.o \
-  ../libswscale/libswscale.a ../libavutil/libavutil.a $(COMMON_LIBS)
-
-vfw2menc$(EXESUF): vfw2menc.c -lwinmm -lole32
-
-#FIXME: Linking is broken, help welcome.
-vivodump$(EXESUF): vivodump.c ../libmpdemux/libmpdemux.a $(COMMON_LIBS)
-
-fastmemcpybench: fastmemcpybench.c
-	$(CC) $(CFLAGS) $< -o fastmem-mmx$(EXESUF)  -DNAME=\"mmx\"      -DHAVE_MMX
-	$(CC) $(CFLAGS) $< -o fastmem-k6$(EXESUF)   -DNAME=\"k6\ \"     -DHAVE_MMX -DHAVE_3DNOW
-	$(CC) $(CFLAGS) $< -o fastmem-k7$(EXESUF)   -DNAME=\"k7\ \"     -DHAVE_MMX -DHAVE_3DNOW -DHAVE_MMX2
-	$(CC) $(CFLAGS) $< -o fastmem-sse$(EXESUF)  -DNAME=\"sse\"      -DHAVE_MMX -DHAVE_SSE   -DHAVE_MMX2
-	$(CC) $(CFLAGS) $< -o fastmem2-mmx$(EXESUF) -DNAME=\"mga-mmx\"  -DHAVE_MGA -DHAVE_MMX
-	$(CC) $(CFLAGS) $< -o fastmem2-k6$(EXESUF)  -DNAME=\"mga-k6\ \" -DHAVE_MGA -DHAVE_MMX -DHAVE_3DNOW
-	$(CC) $(CFLAGS) $< -o fastmem2-k7$(EXESUF)  -DNAME=\"mga-k7\ \" -DHAVE_MGA -DHAVE_MMX -DHAVE_3DNOW -DHAVE_MMX2
-	$(CC) $(CFLAGS) $< -o fastmem2-sse$(EXESUF) -DNAME=\"mga-sse\"  -DHAVE_MGA -DHAVE_MMX -DHAVE_SSE   -DHAVE_MMX2
-
-REAL_SRCS    = $(wildcard realcodecs/*.c)
-REAL_TARGETS = $(REAL_SRCS:.c=.so.6.0)
-
-realcodecs: $(REAL_TARGETS)
-
-fastmemcpybench realcodecs: CFLAGS += -g
-
-%.so.6.0: %.o
-	ld -shared -o $@ $< -ldl -lc
-
-# FIXME: netstream linking is a mess that should be fixed properly some day.
-# It does not work with either GUI, LIVE555, libavformat, cdparanoia enabled.
-NETSTREAM_DEPS = ../libmpdemux/libmpdemux.a \
-                 ../stream/stream.a \
-                 ../dvdread/libdvdread.a \
-                 ../libdvdcss/libdvdcss.a \
-                 ../libavutil/libavutil.a \
-                 ../m_option.o \
-                 ../m_struct.o \
-                  $(COMMON_LIBS)
-
-netstream: netstream.o $(NETSTREAM_DEPS)
-	$(CC) $(CFLAGS) -o $@ $^
-
-clean distclean:
-	rm -f *.o *~ $(OBJS)
-	rm -f fastmem-* fastmem2-* fastmemcpybench netstream
-	rm -f bmovl-test$(EXESUF) vfw2menc$(EXESUF)
-	rm -f $(REAL_TARGETS)
-
-.PHONY: all fastmemcpybench realcodecs clean distclean

TOOLS/avisubdump.c

@@ -7,8 +7,6 @@
  * The subtitles are dumped to stdout.
  */
 
-#define _LARGEFILE_SOURCE
-#define _FILE_OFFSET_BITS 64
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>

TOOLS/movinfo.c

@@ -328,7 +328,7 @@ int main(int argc,char* argv[])
     if ((f = fopen(argc>1?argv[1]:"Akira.mov","rb")) == NULL)
 	return 1;
 
-    printf("%.8s    %.4s (%.8s) %05s [%s]\n\n",
+    printf("%.8s    %.4s (%.8s) %5s [%s]\n\n",
 	"position", "atom", "atomtype", "len", "human readable atom name");
 
     lschunks(f, 0, 0);

TOOLS/realcodecs/14_4.c

@@ -114,7 +114,7 @@ void toc() {
 		usecs+=1000000;
 		--secs;
 	}
-	fprintf(stderr, "Duration: %ld.%0.6lds\n", secs, usecs);
+	fprintf(stderr, "Duration: %ld.%.6lds\n", secs, usecs);
 }
 
 

TOOLS/realcodecs/28_8.c

@@ -114,7 +114,7 @@ void toc() {
 		usecs+=1000000;
 		--secs;
 	}
-	fprintf(stderr, "Duration: %ld.%0.6lds\n", secs, usecs);
+	fprintf(stderr, "Duration: %ld.%.6lds\n", secs, usecs);
 }
 
 

TOOLS/realcodecs/cook.c

@@ -161,7 +161,7 @@ void toc() {
 		usecs+=1000000;
 		--secs;
 	}
-	fprintf(stderr, "Duration: %ld.%0.6lds\n", secs, usecs);
+	fprintf(stderr, "Duration: %ld.%.6lds\n", secs, usecs);
 }
 
 

TOOLS/realcodecs/drv2.c

@@ -138,7 +138,7 @@ void toc() {
 		usecs+=1000000;
 		--secs;
 	}
-//	fprintf(stderr, "Duration: %ld.%0.6lds\n", secs, usecs);
+//	fprintf(stderr, "Duration: %ld.%.6lds\n", secs, usecs);
 }
 
 

TOOLS/realcodecs/drv3.c

@@ -138,7 +138,7 @@ void toc() {
 		usecs+=1000000;
 		--secs;
 	}
-//	fprintf(stderr, "Duration: %ld.%0.6lds\n", secs, usecs);
+//	fprintf(stderr, "Duration: %ld.%.6lds\n", secs, usecs);
 }
 
 

TOOLS/realcodecs/drv4.c

@@ -110,7 +110,7 @@ void toc() {
 		usecs+=1000000;
 		--secs;
 	}
-//	fprintf(stderr, "Duration: %ld.%0.6lds\n", secs, usecs);
+//	fprintf(stderr, "Duration: %ld.%.6lds\n", secs, usecs);
 }
 
 

TOOLS/realcodecs/ra.c

@@ -160,7 +160,7 @@ void toc() {
 		usecs+=1000000;
 		--secs;
 	}
-	fprintf(stderr, "Duration: %ld.%0.6lds\n", secs, usecs);
+	fprintf(stderr, "Duration: %ld.%.6lds\n", secs, usecs);
 }
 
 

TOOLS/realcodecs/rv30.c

@@ -189,7 +189,7 @@ void toc() {
 		usecs+=1000000;
 		--secs;
 	}
-	fprintf(stderr, "Duration: %ld.%0.6lds\n", secs, usecs);
+	fprintf(stderr, "Duration: %ld.%.6lds\n", secs, usecs);
 }
 
 

configure

@@ -451,6 +451,7 @@ multiple paths separated by ':'):
   --with-gtk-config=PATH      path to gtk*-config
   --with-sdl-config=PATH      path to sdl*-config
   --with-dvdnav-config=PATH   path to dvdnav-config
+  --with-dvdread-config=PATH   path to dvdread-config
 
 This configure script is NOT autoconf-based, even though its output is similar.
 It will try to autodetect all configuration options. If you --enable an option
@@ -576,6 +577,7 @@ _ladspa=auto
 _xmms=no
 _dvdnav=auto
 _dvdnavconfig=dvdnav-config
+_dvdreadconfig=dvdread-config
 _dvdread=auto
 _dvdread_internal=auto
 _libdvdcss_internal=auto
@@ -741,6 +743,9 @@ for ac_option do
   --with-dvdnav-config=*)
     _dvdnavconfig=`echo $ac_option | cut -d '=' -f 2`
     ;;
+  --with-dvdread-config=*)
+    _dvdreadconfig=`echo $ac_option | cut -d '=' -f 2`
+    ;;
 
   --extra-libs=*)
     _extra_libs=`echo $ac_option | cut -d '=' -f 2`
@@ -5435,6 +5440,18 @@ EOF
     cc_check -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
       -ldvdread $_ld_dl && _dvdread=yes && _res_comment="external"
   fi
+  if test "$_dvdread" = no ; then
+    _dvdreadconfig="dvdread-config"
+    _dvdreadcflags=`$_dvdreadconfig --cflags`
+    _dvdreadlibs=`$_dvdreadconfig --libs`
+    if cc_check -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
+      $_dvdreadcflags $_dvdreadlibs $_ld_dl ; then
+      _dvdread=yes
+      _inc_extra="$_inc_extra $_dvdreadcflags"
+      _ld_extra="$_ld_extra $_dvdreadlibs"
+      _res_comment="external"
+    fi
+  fi
 fi
 
 if test "$_dvdread_internal" = yes; then
@@ -5905,6 +5922,7 @@ if test "$_tremor_internal" = yes ; then
   _codecmodules="tremor(internal) $_codecmodules"
   _res_comment="internal Tremor"
   if test "$_tremor_low" = yes ; then
+    CFLAGS="$CFLAGS -D_LOW_ACCURACY_"
     _res_comment="internal low accuracy Tremor"
   fi
 elif test "$_tremor_external" = yes ; then
@@ -7817,17 +7835,7 @@ VIDIX_UNICHROME=$_vidix_drv_unichrome
 $_target_arch
 $_target_arch_x86
 TARGET_CPU=$iproc
-HAVE_MMX   = $_mmx
+`echo $_cpuexts | tr '[a-z] ' '[A-Z]\n' | sed 's/^/HAVE_/;s/$/=yes/'`
-HAVE_MMX2   = $_mmxext
-HAVE_3DNOW   = $_3dnow
-HAVE_3DNOWEX   = $_3dnowext
-HAVE_SSE   = $_sse
-HAVE_CMOV   = $_cmov
-HAVE_ALTIVEC   = $_altivec
-HAVE_ARMV5TE   = $_armv5te
-HAVE_ARMV6   = $_armv6
-HAVE_IWMMXT   = $_iwmmxt
-HAVE_VIS   = $_vis
 
 # --- GUI stuff ---
 GUI_GTK = $_gui_gtk

dvdread/Makefile

@@ -1,6 +1,6 @@
 include ../config.mak
 
-LIBNAME_COMMON = libdvdread.a
+LIBNAME_COMMON = dvdread.a
 
 SRCS_COMMON = cmd_print.c \
               dvd_input.c \

etc/codecs.conf

@@ -10,12 +10,14 @@ release 20070930
 ;=============================================================================
 
 videocodec ffmimic
+  status working
   fourcc ML20
   out I420
   driver ffmpeg
   dll "mimic"
 
 videocodec ffkmvc
+  status working
   fourcc KMVC
   out BGR8
   driver ffmpeg
@@ -360,6 +362,14 @@ videocodec theora
 
 ;WIN32:
 
+videocodec msuscls
+  info "MSU Screen Capture Lossless Codec"
+  status working
+  fourcc SCLS
+  driver vfw
+  dll "SCLS.DLL"
+  out BGR32,BGR24,BGR16 flip
+
 videocodec cram
   info "Microsoft Video 1"
   comment "-vf palette required for 8bpp"
@@ -1442,6 +1452,24 @@ videocodec lagarith
   dll "lagarith.dll"
   out BGR32,BGR24 flip
 
+videocodec canopushq
+  status working
+  info "Canopus HQ Codec"
+  comment "requires csehqa.dll and cseuvec.dll"
+  fourcc CUVC
+  driver vfw
+  dll "CUVCcodc.dll"
+  out BGR24
+
+videocodec canopusll
+  status working
+  info "Canopus Lossless Codec"
+  comment "requires csellc.dll"
+  fourcc CLLC
+  driver vfw
+  dll "CLLCcodc.dll"
+  out BGR24
+
 videocodec ffvp3
   info "FFmpeg VP3"
   status untested
@@ -2067,6 +2095,14 @@ videocodec ffthp
   dll thp
   out YV12
 
+videocodec ffbfi
+  info "FFmpeg BFI Video"
+  status working
+  fourcc BFIV ; internal MPlayer FourCC
+  driver ffmpeg
+  dll bfi
+  out BGR8
+
 videocodec ffbethsoftvid
   info "FFmpeg Bethesda Software VID"
   comment "video plays much too fast"
@@ -3301,3 +3337,10 @@ audiocodec hwmpa
   fourcc "MP3 "      ; used in .nsv files
   fourcc "LAME"      ; used in mythtv .nuv files
   driver hwmpa
+
+audiocodec msnsiren
+  info "msn siren audio codec"
+  status working
+  format 0x28E
+  driver acm
+  dll "sirenacm.dll"

gui/app.c

@@ -1,4 +1,20 @@
-
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #include <stdlib.h>
 #include <stdio.h>

gui/app.h

@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #ifndef MPLAYER_GUI_APP_H
 #define MPLAYER_GUI_APP_H
 

gui/bitmap.c

@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

gui/bitmap.h

@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #ifndef MPLAYER_GUI_BITMAP_H
 #define MPLAYER_GUI_BITMAP_H
 

gui/cfg.c

@@ -1,3 +1,20 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #include <stdlib.h>
 #include <stdio.h>

gui/cfg.h

@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #ifndef MPLAYER_GUI_CFG_H
 #define MPLAYER_GUI_CFG_H
 

gui/interface.c

@@ -1,3 +1,20 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #include <inttypes.h>
 #include <stdlib.h>

gui/interface.h

@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #ifndef MPLAYER_GUI_INTERFACE_H
 #define MPLAYER_GUI_INTERFACE_H
 

gui/mplayer/gmplayer.h

@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #ifndef MPLAYER_GUI_GMPLAYER_H
 #define MPLAYER_GUI_GMPLAYER_H
 

gui/mplayer/gtk/about.c

@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #include "config.h"
 #include "gui/app.h"
 #include "help_mp.h"

gui/mplayer/gtk/about.h

@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #ifndef MPLAYER_GUI_ABOUT_H
 #define MPLAYER_GUI_ABOUT_H
 

gui/mplayer/gtk/eq.c

@@ -1,3 +1,20 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #include <stdlib.h>
 #include <stdio.h>

gui/mplayer/gtk/eq.h

@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #ifndef MPLAYER_GUI_EQ_H
 #define MPLAYER_GUI_EQ_H
 

gui/mplayer/gtk/fs.c

@@ -1,3 +1,20 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #include <stdlib.h>
 #include <stdio.h>

gui/mplayer/gtk/fs.h

@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #ifndef MPLAYER_GUI_FS_H
 #define MPLAYER_GUI_FS_H
 

gui/mplayer/gtk/gtk_common.c

@@ -1,3 +1,20 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>

gui/mplayer/gtk/gtk_common.h

@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #ifndef MPLAYER_GUI_GTK_COMMON_H
 #define MPLAYER_GUI_GTK_COMMON_H
 

gui/mplayer/gtk/gtk_url.c

@@ -1,3 +1,20 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #include <sys/types.h>
 #include <sys/stat.h>

gui/mplayer/gtk/gtk_url.h

@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #ifndef MPLAYER_GUI_GTK_URL_H
 #define MPLAYER_GUI_GTK_URL_H
 

gui/mplayer/gtk/mb.c

@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #include "config.h"
 #include "gui/app.h"
 #include "help_mp.h"

gui/mplayer/gtk/mb.h

@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #ifndef MPLAYER_GUI_MB_H
 #define MPLAYER_GUI_MB_H
 

gui/mplayer/gtk/menu.c

@@ -1,3 +1,20 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #include <stdio.h>
 #include <stdlib.h>

gui/mplayer/gtk/menu.h

@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #ifndef MPLAYER_GUI_MENU_H
 #define MPLAYER_GUI_MENU_H
 

gui/mplayer/gtk/opts.c

@@ -1,3 +1,20 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #include <stdlib.h>
 #include <sys/types.h>

gui/mplayer/gtk/opts.h

@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #ifndef MPLAYER_GUI_OPTS_H
 #define MPLAYER_GUI_OPTS_H
 

gui/mplayer/gtk/pl.c

@@ -1,3 +1,20 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #include <sys/types.h>
 #include <sys/stat.h>

gui/mplayer/gtk/pl.h

@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #ifndef MPLAYER_GUI_PL_H
 #define MPLAYER_GUI_PL_H
 

gui/mplayer/gtk/sb.c

@@ -1,3 +1,20 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #include <sys/stat.h>
 #include <glob.h>

gui/mplayer/gtk/sb.h

@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #ifndef MPLAYER_GUI_SB_H
 #define MPLAYER_GUI_SB_H
 

gui/mplayer/gui_common.c

@@ -1,5 +1,22 @@
-
+/*
-// main window
+ * main window
+ *
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #include <stdlib.h>
 #include <stdio.h>

gui/mplayer/gui_common.h

@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #ifndef MPLAYER_GUI_GUI_COMMON_H
 #define MPLAYER_GUI_GUI_COMMON_H
 

gui/mplayer/menu.c

@@ -1,3 +1,20 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #include <stdlib.h>
 #include <stdio.h>

gui/mplayer/mw.c

@@ -1,5 +1,22 @@
-
+/*
-// main window
+ * main window
+ *
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #include <stdlib.h>
 #include <stdio.h>

gui/mplayer/pb.c

@@ -1,5 +1,22 @@
-
+/*
-// main window
+ * main window
+ *
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #include <stdlib.h>
 #include <stdio.h>

gui/mplayer/play.c

@@ -1,3 +1,20 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #include <inttypes.h>
 #include <stdlib.h>

gui/mplayer/play.h

@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #ifndef MPLAYER_GUI_PLAY_H
 #define MPLAYER_GUI_PLAY_H
 

gui/mplayer/sw.c

@@ -1,5 +1,22 @@
-
+/*
-// sub window
+ * sub window
+ *
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #include <inttypes.h>
 #include <string.h>

gui/mplayer/widgets.c

@@ -1,3 +1,20 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #include <stdlib.h>
 #include <stdio.h>

gui/mplayer/widgets.h

@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #ifndef MPLAYER_GUI_WIDGETS_H
 #define MPLAYER_GUI_WIDGETS_H
 

gui/skin/cut.c

@@ -1,3 +1,20 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #include <string.h>
 #include <stdlib.h>

gui/skin/cut.h

@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #ifndef MPLAYER_GUI_CUT_H
 #define MPLAYER_GUI_CUT_H
 

gui/skin/font.c

@@ -1,3 +1,20 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #include <stdlib.h>
 #include <stdio.h>

gui/skin/font.h

@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #ifndef MPLAYER_GUI_FONT_H
 #define MPLAYER_GUI_FONT_H
 

gui/skin/skin.c

@@ -1,3 +1,20 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #include <stdio.h>
 #include <stdlib.h>

gui/skin/skin.h

@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #ifndef MPLAYER_GUI_SKIN_H
 #define MPLAYER_GUI_SKIN_H
 

gui/win32/dialogs.c

@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License along
- * along with MPlayer; if not, write to the Free Software
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <windows.h>

gui/win32/dialogs.h

@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License along
- * along with MPlayer; if not, write to the Free Software
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef MPLAYER_GUI_DIALOGS_H

gui/win32/gui.c

@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License along
- * along with MPlayer; if not, write to the Free Software
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <stdio.h>

gui/win32/gui.h

@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License along
- * along with MPlayer; if not, write to the Free Software
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef MPLAYER_GUI_GUI_H

gui/win32/interface.c

@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License along
- * along with MPlayer; if not, write to the Free Software
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <windows.h>

gui/win32/playlist.c

@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License along
- * along with MPlayer; if not, write to the Free Software
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <windows.h>

gui/win32/playlist.h

@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License along
- * along with MPlayer; if not, write to the Free Software
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef MPLAYER_GUI_PLAYLIST_H

gui/win32/preferences.c

@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License along
- * along with MPlayer; if not, write to the Free Software
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <windows.h>

gui/win32/skinload.c

@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License along
- * along with MPlayer; if not, write to the Free Software
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <stdlib.h>

gui/win32/skinload.h

@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License along
- * along with MPlayer; if not, write to the Free Software
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef MPLAYER_GUI_SKINLOAD_H

gui/win32/widgetrender.c

@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License along
- * along with MPlayer; if not, write to the Free Software
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <stdio.h>

gui/win32/wincfg.c

@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License along
- * along with MPlayer; if not, write to the Free Software
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <windows.h>

gui/wm/ws.c

@@ -1,8 +1,23 @@
-
+/*
-// --------------------------------------------------------------------------
+ * AutoSpace Window System for Linux/Win32 v0.85
-//  AutoSpace Window System for Linux/Win32 v0.85
+ * written by pontscho/fresh!mindworkz
-//   Writed by pontscho/fresh!mindworkz
+ *
-// --------------------------------------------------------------------------
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #include <X11/Xlib.h>
 #include <X11/Xproto.h>

gui/wm/ws.h

@@ -1,8 +1,23 @@
-
+/*
-// ----------------------------------------------------------------------------------------------
+ * AutoSpace Window System for Linux/Win32 v0.61
-//  AutoSpace Window System for Linux/Win32 v0.61
+ * written by pontscho/fresh!mindworkz
-//   Writed by pontscho / fresh!mindworkz
+ *
-// ----------------------------------------------------------------------------------------------
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #ifndef MPLAYER_GUI_WS_H
 #define MPLAYER_GUI_WS_H

gui/wm/wskeys.h

@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #ifndef MPLAYER_GUI_WSKEYS_H
 #define MPLAYER_GUI_WSKEYS_H
 

gui/wm/wsmkeys.h

@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #ifndef MPLAYER_GUI_WSMKEYS_H
 #define MPLAYER_GUI_WSMKEYS_H
 

gui/wm/wsxdnd.c

@@ -1,5 +1,22 @@
-/* Took WindowMaker implementation and adopted for MPlayer */
+/*
-
+ * WindowMaker implementation adopted for MPlayer
+ *
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #include <X11/Xlib.h>
 #include "ws.h"

gui/wm/wsxdnd.h

@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #ifndef MPLAYER_GUI_WSXDND_H
 #define MPLAYER_GUI_WSXDND_H
 

help/help_mp-tr.h

@@ -1,19 +1,20 @@
 // MPlayer Turkish Translation
-// Synced with help_mp-en.h r20191
+// Synced with help_mp-en.h r26067
 // Translated by: Tuncer Altay, tunceraltay (at) yahoo.com and Kadir T. İri, centurium (at) gmx.net
-// Tuncer Altay did a great job! Eline sağlık! 
+// Additions by Mehmet KÖSE <mehmetkse@gmail.com> 
+// ~/Turkey/Ankara/Ankara University/Computer Engineering Department
 
 // ========================= MPlayer help ===========================
 
 #ifdef HELP_MP_DEFINE_STATIC
 static char help_text[]=
-"Kullanım: mplayer [seçenekler] [url|yol/]dosya adı\n"
+"Kullanım: mplayer [seçenekler] [adres|yol/]dosya adı\n"
 "\n"
 "Genel seçenekler: (Tüm seçenekler için man sayfalarına bakınız)\n"
-" -vo <drv>          video çıkış sürücüsünü seçer ('-vo help' ile listeyi görebilirsiniz)\n"
+" -vo <sürücü>          video çıkış sürücüsünü seçer ('-vo help' ile listeyi görebilirsiniz)\n"
-" -ao <drv>          ses çıkış sürücüsü seçer ('-ao help' ile listeyi görebilirsiniz)\n"
+" -ao <sürücü>          ses çıkış sürücüsü seçer ('-ao help' ile listeyi görebilirsiniz)\n"
 #ifdef HAVE_VCD
-" vcd://<parçano>    (S)VCD (Süper Video CD) parça numarasını oynatır (sade aygıtı kullan, sisteme takma\n"
+" vcd://<parçano>    (S)VCD (Süper Video CD) parça numarasını oynatır (sade aygıtı kullan, sisteme takma)\n"
 #endif
 #ifdef USE_DVDREAD
 " dvd://<başlıkno>   Dosya yerine aygıttan DVD başlığını oynatır.\n"
@@ -21,9 +22,9 @@ static char help_text[]=
 #endif
 " -ss <zamankon>     Verilen konumu arar (saniye veya hh:mm:ss ;saat:dakika:saniye olarak)\n"
 " -nosound           Sesi çalmaz\n"
-" -fs -vm -zoom      Tam ekran çalıştırma seçenekleri (fullscr,vidmode chg,softw.scale)\n"
+" -fs -vm -zoom      Tam ekran çalıştırma seçenekleri (veya -vm, -zoom, detaylar man sayfalarında)\n"
 " -x <x> -y <y>      Ekran çözünürlüğünü ayarlar (-vm veya -zoom kullanımı için)\n"
-" -sub <dosya>       Kullanılacak altyazı dosyasını seçer (-subfps, -subdelay seçeneklerine bakınız)\n"
+" -sub <dosya>       Kullanılacak altyazı dosyasını seçer ( ayrıca -subfps, -subdelay seçeneklerine bakınız)\n"
 " -playlist <dosya>  Çalma listesi dosyasını seçer\n"
 " -vid x -aid y      Oynatılacak video (x) ve çalınacak ses (y) yayınını(stream) seçer\n"
 " -fps x -srate y    Video (x) biçimini fps olarak ve ses (y) biçimini Hz olarak değiştirir\n"
@@ -41,9 +42,9 @@ static char help_text[]=
 " o                  OSD modunu değiştir:  yok / oynatma imi / oynatma imi + zamanlayıcı\n"
 " * veya /           sesi yükselt veya alçalt\n"
 " z veya x           altyazı gecikmesini +/- 0.1 saniye olarak ayarla\n"
-" r veya t           altyazı konumunu yukarı/aşağı ayarla, -vf expand seçeneğinede bakınız\n"
+" r veya t           altyazı konumunu yukarı/aşağı ayarla, -vf seçeneğine de bakınız\n"
 "\n"
-" * * AYRINTILAR İÇİN MAN SAYFALARINA BAKINIZ, DAHA FAZLA (İLERİ) SEÇENEKLER VE TUŞLAR BULABİLİRSİNİZ * *\n"
+" * * AYRINTILAR, DAHA FAZLA (GELİŞMİŞ) SEÇENEKLER VE TUŞLAR İÇİN MAN SAYFALARINA BAKINIZ * *\n"
 "\n";
 #endif
 
@@ -59,8 +60,8 @@ static char help_text[]=
 #define MSGTR_Exit_quit "Çık"
 #define MSGTR_Exit_eof "Dosya sonu"
 #define MSGTR_Exit_error "Önemli Hata"
-#define MSGTR_IntBySignal "\nMPlayer %d hatası yüzünden kapandı, modül: %s\n"
+#define MSGTR_IntBySignal "\nMPlayer %d sinyali tarafından kapatıldı, modül: %s\n"
-#define MSGTR_NoHomeDir "Anadizin bulunamıyor\n"
+#define MSGTR_NoHomeDir "Anadizin(HOME) bulunamıyor\n"
 #define MSGTR_GetpathProblem "get_path(\"config\") problemi\n"
 #define MSGTR_CreatingCfgFile "Ayar dosyası oluşturuluyor: %s\n"
 #define MSGTR_BuiltinCodecsConf "Gömülü codecs.conf dosyası kullanılıyor\n"
@@ -68,7 +69,7 @@ static char help_text[]=
 #define MSGTR_CantLoadSub "Altyazı açılamıyor: %s\n"
 #define MSGTR_DumpSelectedStreamMissing "döküm: HATA:seçili yayın(stream) hatalı!\n"
 #define MSGTR_CantOpenDumpfile "döküm(dump) dosyası açılamıyor!!!\n"
-#define MSGTR_CoreDumped "Program kapandı :)\n"
+#define MSGTR_CoreDumped "Belleğin dökümü alındı ;)\n"
 #define MSGTR_FPSnotspecified "Başlıktaki FPS belirsiz veya geçersiz, -fps seçeneğini kullanınız!\n"
 #define MSGTR_TryForceAudioFmtStr "%s ses kodek sürücülerini zorlama deneniyor...\n"
 #define MSGTR_CantFindAudioCodec "0x%X! ses biçimi için kodek bulunamıyor\n"
@@ -77,21 +78,21 @@ static char help_text[]=
 #define MSGTR_CantFindVideoCodec "Seçili -vo sürücüsü ve 0x%X video biçimi için kodek bulunamadı!\n"
 #define MSGTR_CannotInitVO "HATA: Video sürücüsü başlatılamıyor!\n"
 #define MSGTR_CannotInitAO "Ses aygıtı açılamadı/başlatılamadı -> ses yok\n"
-#define MSGTR_StartPlaying "Yeniden başlatılıyor...\n"
+#define MSGTR_StartPlaying "Çalma başlatılıyor...\n"
 
 #define MSGTR_SystemTooSlow "\n\n"\
 "           ***************************************************\n"\
 "           *** Sisteminiz dosyayı oynatmak için çok YAVAŞ! ***\n"\
 "           ***************************************************\n\n"\
 " Olası nedenler, sorunlar , çözümler:\n"\
-"- Çoğu ortak: bozuk/hatalı _ses_ sürücüsü\n"\
+"- En yaygın: bozuk/hatalı _ses_ sürücüsü\n"\
-"  - \"-ao sdl\" seçeneğini deneyiniz veya ALSA OSS emulasyonunu kullanınız.\n"\
+"  - \"-ao sdl\" seçeneğini deneyiniz veya ALSA'nın OSS emulasyonunu kullanınız.\n"\
 "  - \"-autosync\" seçeneği için farklı değerler deneyiniz, 30 iyi bir başlangıçtır.\n"\
 "- Yavaş video çıktısı\n"\
 "  - Farklı bir -vo sürücüsü deneyiniz (liste için -vo help) veya -framedrop seçeneğini deneyiniz!\n"\
 "- Yavaş işlemci\n"\
 "  - Yavaş bir işlemci ile büyük bir DVD/DivX oynatmayınız! Bazı lavdopts seçeneklerini deneyiniz,\n"\
-"     örn: vfm ffmpeg -lavdopts lowres=1:fast:skiploopfilter=all\n"\
+"     örn: -vfm ffmpeg -lavdopts lowres=1:fast:skiploopfilter=all\n"\
 "- Bozuk dosya\n"\
 "  - \"-nobps -ni -forceidx -mc 0\" seçeneğinin çeşitli bileşenlerini deneyiniz.\n"\
 "- Yavaş medya (NFS/SMB bağlamaları, DVD, VCD vb.)\n"\
@@ -102,12 +103,12 @@ static char help_text[]=
 "Bunların hiçbirisi size yardım etmiyorsa DOCS/HTML/en/bugreports.html sayfasını okuyunuz.\n\n"
 
 #define MSGTR_NoGui "MPlayer GRAFİK ARABİRİMSİZ seçeneğiyle oluşturulmuş!\n"
-#define MSGTR_GuiNeedsX "MPlayer grafik arabirimi grafik ortam gerektirir!\n"
+#define MSGTR_GuiNeedsX "MPlayer grafik arabirimi X11 gerektirir!\n"
 #define MSGTR_Playing "%s oynatılıyor\n"
 #define MSGTR_NoSound "Ses: ses yok!\n"
 #define MSGTR_FPSforced "FPS  %5.3f olarak zorlandı (ftime: %5.3f)\n"
-#define MSGTR_CompiledWithRuntimeDetection "MPlayer runtime CPU detection ile derlendi. - Dikkat, bu özellik hızlı değildir! En iyi performansı alabilmek için, MPlayer'ı -disable-runtime-cpudetection seçeneği ile tekrar derleyiniz.\n"
+#define MSGTR_CompiledWithRuntimeDetection "MPlayer runtime CPU detection ile derlendi.\n"
-#define MSGTR_CompiledWithCPUExtensions "x86 işlemci için eklerle derlendi:"
+#define MSGTR_CompiledWithCPUExtensions "x86 işlemci için uzantılarla derlendi:"
 #define MSGTR_AvailableVideoOutputDrivers "Kullanılabilir video çıktı sürücüleri:\n"
 #define MSGTR_AvailableAudioOutputDrivers "Kullanılabilir ses çıktı sürücüleri:\n"
 #define MSGTR_AvailableAudioCodecs "Kullanılabilir ses kodekleri:\n"
@@ -122,7 +123,7 @@ static char help_text[]=
 #define MSGTR_ForcedVideoCodec "Video kodeği zorlandı: %s\n"
 #define MSGTR_ForcedAudioCodec "Ses kodeği zorlandı: %s\n"
 #define MSGTR_Video_NoVideo "Video: video yok!!!\n"
-#define MSGTR_NotInitializeVOPorVO "\nHATA: Video filtreleri (-vf) veya video çıkışı (-vo) yüklenemedi!\n"
+#define MSGTR_NotInitializeVOPorVO "\nHATA: Video filtreleri (-vf) veya video çıkışı (-vo) başlatılamadı!\n"
 #define MSGTR_Paused "\n--------   DURAKLADI   --------\r"
 #define MSGTR_PlaylistLoadUnable "\n%s çalma listesi yüklenemedi.\n"
 #define MSGTR_Exit_SIGILL_RTCpuSel \
@@ -132,12 +133,12 @@ static char help_text[]=
 #define MSGTR_Exit_SIGILL \
 "- 'Geçersiz Komut' nedeniyle MPlayer çöktü.\n"\
 "  Genellikle uygulamanın derlendiği/geliştirildiği işlemciden farklı bir işlemci üzerinde\n"\
-"  MPlayer'ı çalıştırdığınızda bu hata oluşabilir.\n"\
+"  MPlayer'ı çalıştırdığınızda bu hata oluşur.\n"\
-"  Bu durumu kontrol ediniz!\n"
+"  Bunu doğrulayın!\n"
 #define MSGTR_Exit_SIGSEGV_SIGFPE \
 "- Mplayer CPU/FPU/RAM'in hatalı kullanımı nedeniyle çöktü.\n"\
-" Bir 'gdb' backtrace ve disassembly oluşturunuz. Mplayer'ı --enable-debug seçeneğiyle\n"\
+" Mplayer'ı --enable-debug seçeneğiyle yeniden derleyiniz. Bir 'gdb' backtrace ve\n"\  
-"  yeniden derleyiniz. Ayrıntılar için DOCS/HTML/en/bugreports_what.html#bugreports_crash\n"
+" disassembly oluşturunuz. Ayrıntılar için DOCS/HTML/en/bugreports_what.html#bugreports_crash\n"
 #define MSGTR_Exit_SIGCRASH \
 "- Mplayer çöktü. Bu durum oluşmamalıydı.\n"\
 "  MPlayer kodları, gcc sürümünüz veya sürücülerinizde bir hata olabilir. Mplayer hatası \n"\
@@ -145,6 +146,8 @@ static char help_text[]=
 "  ve yönergeleri izleyiniz. Muhtemel bir hata bildirirken bu bilgileri sağlayamazsanız \n"\
 "  yardım edemeyiz ve etmeyeceğiz.\n"
 #define MSGTR_LoadingConfig "'%s' ayarı yükleniyor\n"
+#define MSGTR_LoadingProtocolProfile "Protokole bağlı profil yükleniyor '%s'\n"
+#define MSGTR_LoadingExtensionProfile "Uzantıya bağlı profil yükleniyor '%s'\n"
 #define MSGTR_AddedSubtitleFile "ALTYAZI: (%d) altyazı dosyası eklendi : %s\n"
 #define MSGTR_RemovedSubtitleFile "ALTYAZI: (%d) altyazı dosyası kaldırıldı: %s\n"
 #define MSGTR_ErrorOpeningOutputFile "Yazma esnasında [%s] dosyası açılış hatası!\n"
@@ -155,19 +158,18 @@ static char help_text[]=
 #define MSGTR_LinuxRTCInitErrorPieOn "ioctl'de Linux RTC açılış hatası (rtc_pie_on): %s\n"
 #define MSGTR_UsingTimingType "%s zamanlaması kullanılıyor.\n"
 #define MSGTR_NoIdleAndGui "GMPlayer ile -idle seçeneği kullanılamaz.\n"
-#define MSGTR_MenuInitialized "Menü açıldı: %s\n"
+#define MSGTR_MenuInitialized "Menü başlatıldı: %s\n"
-#define MSGTR_MenuInitFailed " Menü açılamadı.\n"
+#define MSGTR_MenuInitFailed " Menü başlatılamadı.\n"
-#define MSGTR_Getch2InitializedTwice "UYARI:getch2_init iki defa adlandırıldı!\n"
+#define MSGTR_Getch2InitializedTwice "UYARI:getch2_init iki defa çağırıldı!\n"
 #define MSGTR_DumpstreamFdUnavailable "Bu yayın dökülemez (dump) - kullanılabilir dosya tanımlayıcısı yok.\n"
-#define MSGTR_FallingBackOnPlaylist "%s çalma listesi ayrıştırma sınamasına başvuruluyor...\n"
 #define MSGTR_CantOpenLibmenuFilterWithThisRootMenu "%s root menüsü ile libmenu video filtresi açılamaz.\n"
-#define MSGTR_AudioFilterChainPreinitError "Ses filtresi ön-açılışında hata!\n"
+#define MSGTR_AudioFilterChainPreinitError "Ses filtresi zincirinde başlama öncesi hata!\n"
 #define MSGTR_LinuxRTCReadError "Linux RTC okuma hatası: %s\n"
 #define MSGTR_SoftsleepUnderflow "Uyarı! softsleep underflow!\n"
 #define MSGTR_DvdnavNullEvent "DVDNAV Olayı NULL?!\n"
 #define MSGTR_DvdnavHighlightEventBroken "DVDNAV Olayı: Vurgu olayı bozuk\n"
 #define MSGTR_DvdnavEvent "DVDNAV Olayı: %s\n"
-#define MSGTR_DvdnavHighlightHide "DVDNAV Olayı: Vurgu Saklı?\n"
+#define MSGTR_DvdnavHighlightHide "DVDNAV Olayı: Vurgu Saklı\n"
 #define MSGTR_DvdnavStillFrame "########################## DVDNAV Olayı: Hareketsiz kare: %d sn\n"
 #define MSGTR_DvdnavNavStop "DVDNAV Olayı: Nav Duruş DVDNAV\n"
 #define MSGTR_DvdnavNavNOP "DVDNAV Olayı: Nav NOP\n"
@@ -188,18 +190,27 @@ static char help_text[]=
 #define MSGTR_EdlNOsh_video "Video olmadan EDL kullanılamaz, devredışı bırakılıyor.\n"
 #define MSGTR_EdlNOValidLine "Geçersiz EDL satırı: %s\n"
 #define MSGTR_EdlBadlyFormattedLine "[%d] EDL satırı hatalı düzenlenmiş, çıkarılıyor.\n"
-#define MSGTR_EdlBadLineOverlap "Önceki duruş konumu [%f]; sonraki başlangıç "\
+#define MSGTR_EdlBadLineOverlap "Son duruş konumu [%f] idi; sonraki başlangıç "\
-"[%f]. Girişler kronolojik düzende olamalıdır, bindirme olamaz. Çıkarılıyor.\n"
+"[%f]. Girişler kronolojik düzende olamalıdır, bindirme olamaz. İptal ediliyor.\n"
 #define MSGTR_EdlBadLineBadStop "Duruş zamanı başlangıç zamanından sonra olmalıdır.\n"
+#define MSGTR_EdloutBadStop "EDL atlaması iptal edildi, son başlama > duruş\n"
+#define MSGTR_EdloutStartSkip "EDL atlaması başlangıcı, bloğu bitirmek için\n"\
+"'i' tuşuna tekrar basın.\n"
+#define MSGTR_EdloutEndSkip "EDL atlaması sonu, satır yazıldı.\n"
+#define MSGTR_MPEndposNoSizeBased "MPlayer'da -endpos seçeneği henüz boyut birimlerini desteklemiyor.\n"
 
 // mplayer.c OSD
 
 #define MSGTR_OSDenabled "etkin"
 #define MSGTR_OSDdisabled "etkisiz"
+#define MSGTR_OSDAudio "Ses: %s"
+#define MSGTR_OSDVideo "Görüntü: %s"
 #define MSGTR_OSDChannel "Kanal: %s"
 #define MSGTR_OSDSubDelay "Altyazı gecikmesi: %d ms"
 #define MSGTR_OSDSpeed "Hız: x %6.2f"
 #define MSGTR_OSDosd "OSD: %s"
+#define MSGTR_OSDChapter "Kısım: (%d) %s"
+#define MSGTR_OSDAngle "Açı: %d/%d"
 
 // property values
 #define MSGTR_Enabled "etkin"
@@ -210,6 +221,9 @@ static char help_text[]=
 #define MSGTR_Bottom "alt"
 #define MSGTR_Center "orta"
 #define MSGTR_Top "üst"
+#define MSGTR_SubSourceFile "dosya"
+#define MSGTR_SubSourceVobsub "vobsub"
+#define MSGTR_SubSourceDemux "gömülü"
 
 // osd bar names
 #define MSGTR_Volume "Ses"
@@ -219,8 +233,10 @@ static char help_text[]=
 #define MSGTR_Contrast " Karşıtlık"
 #define MSGTR_Saturation "Doygunluk"
 #define MSGTR_Hue "Renk"
+#define MSGTR_Balance "Denge"
 
 // property state
+#define MSGTR_LoopStatus "Döngü: %s"
 #define MSGTR_MuteStatus " Sessiz: %s"
 #define MSGTR_AVDelayStatus "A-V gecikmesi: %s"
 #define MSGTR_OnTopStatus "Üstte kalma: %s"
@@ -229,16 +245,18 @@ static char help_text[]=
 #define MSGTR_FramedroppingStatus "Atlanan kare: %s"
 #define MSGTR_VSyncStatus "VSync: %s"
 #define MSGTR_SubSelectStatus "Altyazılar: %s"
+#define MSGTR_SubSourceStatus "Altyazı kaynağı: %s"
 #define MSGTR_SubPosStatus "Altyazı konumu: %s/100"
 #define MSGTR_SubAlignStatus "Altyazı hizalama: %s"
 #define MSGTR_SubDelayStatus "Altyazı gecikmesi: %s"
+#define MSGTR_SubScale "Altyazı ölçeği: %s"
 #define MSGTR_SubVisibleStatus "Altyazılar: %s"
 #define MSGTR_SubForcedOnlyStatus "Sadece zorunlu altyazı:  %s"
 
 // mencoder.c:
 
 #define MSGTR_UsingPass3ControlFile "pass3 kontrol dosyası kullanılıyor: %s\n"
-#define MSGTR_MissingFilename "\nHatalı dosya_adı!\n\n"
+#define MSGTR_MissingFilename "\nDosya adı eksik\n\n"
 #define MSGTR_CannotOpenFile_Device "dosya/aygıt açılamadı\n"
 #define MSGTR_CannotOpenDemuxer "Ayrıştırıcı açılamadı\n"
 #define MSGTR_NoAudioEncoderSelected "\nSeçili Ses kodlayıcı (-oac) yok!  Birini seçin veya -nosound seçeneğini kullanınız. Yardım için: -oac help \n"
@@ -248,20 +266,23 @@ static char help_text[]=
 #define MSGTR_MencoderWrongFormatAVI "\nUYARI: ÇIKTI DOSYA BİÇİMİ _AVI_. yardım için: -of help yazınız.\n"
 #define MSGTR_MencoderWrongFormatMPG "\nUYARI: ÇIKTI DOSYA BİÇİMİ _MPEG_. yardım için: -of help yazın.\n"
 #define MSGTR_MissingOutputFilename "Çıktı dosyası belirtilmedi, Lütfen -o seçeneğine bakınız."
-#define MSGTR_ForcingOutputFourcc "fourcc çıktısı %x [%.4s] olarak zorlanıyor\n"
+#define MSGTR_ForcingOutputFourcc "FourCC çıktısı %x [%.4s] olarak zorlanıyor\n"
 #define MSGTR_ForcingOutputAudiofmtTag "Çıktı ses biçim etiketi 0x%x olarak zorlanıyor.\n"
 #define MSGTR_DuplicateFrames "\n%d çift kare!\n"
 #define MSGTR_SkipFrame "\nKare atlanıyor!   \n"
-#define MSGTR_ResolutionDoesntMatch "\nYeni video dosyası öncekinden farklı renk biçimi ve çözünürlüğe sahip.\n"
+#define MSGTR_ResolutionDoesntMatch "\nYeni video dosyası öncekinden farklı renk biçimi veya çözünürlüğe sahip.\n"
 #define MSGTR_FrameCopyFileMismatch "\nTüm video dosyaları -ovc kopyalamasına göre aynı fps, çözünürlük ve kodek içermelidir.\n"
 #define MSGTR_AudioCopyFileMismatch "\nTüm dosyalar -oac kopyalamasına göre aynı ses kodek ve biçimini içermelidir.\n"
 #define MSGTR_NoAudioFileMismatch "\nSes ve video dosyaları ile sadece video dosyaları karıştırılamaz. -nosound deneyiniz.\n"
 #define MSGTR_NoSpeedWithFrameCopy "UYARI:-oac kopyalama ile -speed seçeneğinin\n"\
 "sorunsuz çalıştığına güvence verilmiyor. Kodlamanız bozuk olabilir!\n"
 #define MSGTR_ErrorWritingFile "%s: dosya yazma hatası.\n"
+#define MSGTR_FlushingVideoFrames "\nGörüntü kareleri boşaltılıyor.\n"
+#define MSGTR_FiltersHaveNotBeenConfiguredEmptyFile "Filtreler ayarlanmadı! Dosya boş mu?\n"
 #define MSGTR_RecommendedVideoBitrate "%s CD'si için önerilen video bit oranı: %d\n"
 #define MSGTR_VideoStreamResult "\nVideo biçimi: %8.3f kbit/sn  (%d bps)  boyut: %"PRIu64" bayt  %5.3f sn %d kare\n"
 #define MSGTR_AudioStreamResult "\nSes biçimi: %8.3f kbit/s  (%d bps)  boyut: %"PRIu64" bayt  %5.3f sn\n"
+#define MSGTR_EdlSkipStartEndCurrent "EDL ATLAMASI: Başlama: %.2f  Bitiş: %.2f   Şimdiki: G: %.2f  S: %.2f     \r"
 #define MSGTR_OpenedStream "başarım: biçim: %d veri: 0x%X - 0x%x\n"
 #define MSGTR_VCodecFramecopy "videocodec: framecopy (%dx%d %dbpp fourcc=%x)\n"
 #define MSGTR_ACodecFramecopy "audiocodec: framecopy (biçim=%x chens=%d rate=%d bits=%d B/s=%d sample-%d)\n"
@@ -286,8 +307,8 @@ static char help_text[]=
 "\n"\
 "Kullanılabilir profiller:\n"\
 "\n"\
-"   <fast>        standard\n"\
+"   <hızlı>        standard\n"\
-"   <fast>        extreme\n"\
+"   <hızlı>        extreme\n"\
 "                 insane\n"\
 "   <cbr> (ABR Mode) - ABR modu ima edilir. Kullanmak için\n"\
 "                      sadece bir bit oranı belirleyin. Örneğin:\n"\
@@ -303,13 +324,13 @@ static char help_text[]=
 "\n"\
 "Daha fazla bilgi için deneyiniz: \"-lameopts preset=help\"\n"
 #define MSGTR_LamePresetsLongInfo "\n"\
-"Önayarlama düğmeleri en yüksek olası kaliteyi sağlamak içim tasarlanmıştır.\n"\
+"Önayarlama geçişleri en yüksek olası kaliteyi sağlamak içim tasarlanmıştır.\n"\
 "\n"\
 "Bu hedefi doğrulamak ve başarmak için dinleme testleri körlere benzer titizlikle\n"\
 "yapıldı ve önayarlama düğmeleri için çoğunlukla bu durumla karşı karşıya kalındı.\n"\
 "\n"\
-"Gerçekleşen en son gelişmelerle uyumlu hale getirmek için sürekli olarak bu düğmeler\n"\
+"Gerçekleşen en son gelişmelerle uyumlu hale getirmek için sürekli olarak bunlar\n"\
-"güncellenir. Sonuç olarak önayarlama düğmeleri şu andaki LAME ile birlikte hemen hemen\n"\
+"güncellenir. Sonuç olarak önayarlama geçişleri şu andaki LAME ile birlikte hemen hemen\n"\
 "en iyi kaliteyle size sağlanmalıdır.\n"\
 "\n"\
 "Bu önayarlamaları etkinleştirme:\n"\
@@ -382,7 +403,7 @@ static char help_text[]=
 #define MSGTR_LameCantInit \
 "LAME seçenekleri ayarlanamıyor, bit oranı/örnekleme oranını kontrol ediniz,\n"\
 "bazı düşük bit oranları (<32) daha düşük örnekleme oranını gerektiriyor. "\
-"(örn: -srate 8000). Başka bir sorun çıkarsa bir önayarlama deneyiniz. "
+"(örn: -srate 8000). Başka birşey çalışmazsa bir önayarlama deneyiniz. "
 #define MSGTR_ConfigFileError "ayar dosyası hatası"
 #define MSGTR_ErrorParsingCommandLine "komutsatırı ayrıştırma hatası"
 #define MSGTR_VideoStreamRequired "Video yayını(stream) zorunlu!\n"
@@ -392,9 +413,9 @@ static char help_text[]=
 #define MSGTR_MemAllocFailed "Bellek atanamadı\n"
 #define MSGTR_NoMatchingFilter "filter/ao biçimi eşleşmesi bulunamadı!\n"
 #define MSGTR_MP3WaveFormatSizeNot30 "sizeof(MPEGLAYER3WAVEFORMAT)==%d!=30, C derleyicisi bozuk  olabilir?\n"
-#define MSGTR_NoLavcAudioCodecName "LAVC Sesi, Hatalı kodek adı!\n"
+#define MSGTR_NoLavcAudioCodecName "LAVC Sesi, Kodek adı eksik!\n"
 #define MSGTR_LavcAudioCodecNotFound "LAVC Sesi,  %s kodek türü için kodlayıcı bulunmadı.\n"
-#define MSGTR_CouldntAllocateLavcContext "LAVC Sesi,  bağlam atanamadı!\n"
+#define MSGTR_CouldntAllocateLavcContext "LAVC Sesi,  içerik atanamadı!\n"
 #define MSGTR_CouldntOpenCodec "%s kodeği açılamadı br=%d\n"
 #define MSGTR_CantCopyAudioFormat "0x%x ses biçimi -oac kopyalaması ile uyumsuz, lütfen önceki seçenek yerine  '-oac pcm' seçeneğini  deneyiniz veya üzerine yazmak için '-fafmttag' seçeneğini kullanınız.\n"
 
@@ -402,11 +423,11 @@ static char help_text[]=
 
 #define MSGTR_MEncoderMP3LameHelp "\n\n"\
 " vbr=<0-4>       değişken bit oranı yöntemi\n"\
-"                  0: cbr\n"\
+"                  0: cbr (sabit bit oranı)\n"\
-"                  1: mt\n"\
+"                  1: mt (Mark Taylor VBR algoritması)\n"\
-"                  2: rh(default)\n"\
+"                  2: rh (Robert Hegemann VBR algoritması - varsayılan)\n"\
-"                  3: abr\n"\
+"                  3: abr (ortalama bit oranı)\n"\
-"                  4: mtrh\n"\
+"                  4: mtrh (Mark Taylor Robert Hegemann VBR algoritması)\n"\
 "\n"\
 " abr             ortalama bit oranı\n"\
 "\n"\
@@ -429,10 +450,10 @@ static char help_text[]=
 "                  2: dualchannel\n"\
 "                  3: mono\n"\
 "\n"\
-" padding=<0-2>\n"\
+" destekleme=<0-2>\n"\
-"                  0: no\n"\
+"                  0: yok\n"\
-"                  1: all\n"\
+"                  1: hepsi\n"\
-"                  2: adjust\n"\
+"                  2: ayarla\n"\
 "\n"\
 " fast            VBR önayarlama modlarında daha hızlı kodlamayı başlatır\n"\
 "                  biraz daha düşük kalite ve daha yüksek bit oranları.\n"\
@@ -454,7 +475,7 @@ static char help_text[]=
 #define MSGTR_ParseError "ayrıştırma hatası"
 #define MSGTR_ParseErrorFIDNotNumber "ayrıştırma hatası (ID biçimi bir sayı değil?)"
 #define MSGTR_ParseErrorFIDAliasNotNumber "ayrıştırma hatası (ID takma adı bir sayı değil?)"
-#define MSGTR_DuplicateFID "kopyalanan ID biçimi"
+#define MSGTR_DuplicateFID "Birden fazla ID biçimi"
 #define MSGTR_TooManyOut "Çok sayıda hata..."
 #define MSGTR_InvalidCodecName "\nkodek(%s) adı geçersiz!\n"
 #define MSGTR_CodecLacksFourcc "\nkodek(%s) FourCC/biçiminde değil!\n"
@@ -468,10 +489,10 @@ static char help_text[]=
 #define MSGTR_CantGetMemoryForLine "'satır' için belleğe ulaşılamıyor: %s\n"
 #define MSGTR_CantReallocCodecsp "'*codecsp': %s yeniden atanamıyor.\n"
 #define MSGTR_CodecNameNotUnique "'%s' adı benzersiz değil."
-#define MSGTR_CantStrdupName "Can't strdup -> 'name': %s\n"
+#define MSGTR_CantStrdupName "strdup yapılamıyor -> 'isim': %s\n"
-#define MSGTR_CantStrdupInfo "Can't strdup -> 'info': %s\n"
+#define MSGTR_CantStrdupInfo "strdup yapılamıyor -> 'bilgi': %s\n"
-#define MSGTR_CantStrdupDriver "Can't strdup -> 'driver': %s\n"
+#define MSGTR_CantStrdupDriver "strdup yapılamıyor -> 'sürücü': %s\n"
-#define MSGTR_CantStrdupDLL "Can't strdup -> 'dll': %s"
+#define MSGTR_CantStrdupDLL "strdup yapılamıyor -> 'dll': %s"
 #define MSGTR_AudioVideoCodecTotals "%d adet ses & %d adet video kodeği mevcut\n"
 #define MSGTR_CodecDefinitionIncorrect "Kodek doğru şekilde tanımlanmamış."
 #define MSGTR_OutdatedCodecsConf "Bu codecs.conf dosyası çok eski ve bu Mplayer sürümü ile bağdaşmıyor."
@@ -479,6 +500,16 @@ static char help_text[]=
 // fifo.c
 #define MSGTR_CannotMakePipe "PIPE yapılamıyor!\n"
 
+// parser-mecmd.c, parser-mpcmd.c
+#define MSGTR_NoFileGivenOnCommandLine "'--' daha fazlaseçenek yok demektir, fakat komut satırında\n"\
+" hiçbir dosya adı belirtilmemiş.\n"
+#define MSGTR_TheLoopOptionMustBeAnInteger "Döngü seçeneği bir tamsayı olmalıdır: %s\n"
+#define MSGTR_UnknownOptionOnCommandLine "Komut satırında bilinmeyen seçenek: -%s\n"
+#define MSGTR_ErrorParsingOptionOnCommandLine "Komut satırındaki seçeneği ayrıştırmada hata: -%s\n"
+#define MSGTR_InvalidPlayEntry "Geçersiz çalma girişi %s\n"
+#define MSGTR_NotAnMEncoderOption "-%s bir MEncoder seçeneği değil\n"
+#define MSGTR_NoFileGiven "Hiçbir dosya verilmemiş\n"
+
 // m_config.c
 #define MSGTR_SaveSlotTooOld "Bulunan çok eski kayıt boşluğu (slot) lvl %d: %d !!!\n"
 #define MSGTR_InvalidCfgfileOption "%s seçeneği bir ayar dosyasında kullanılamaz. \n"
@@ -496,7 +527,7 @@ static char help_text[]=
 
 // m_property.c
 #define MSGTR_PropertyListHeader "\n Ad                   Tür             En az      En çok\n\n" 
-#define MSGTR_TotalProperties "\nToplam: %d özellikleri \n"
+#define MSGTR_TotalProperties "\nToplam: %d özellik\n"
 
 // open.c, stream.c:
 #define MSGTR_CdDevNotfound "CD-ROM Sürücüsü '%s' bulunamadı!\n"
@@ -506,15 +537,20 @@ static char help_text[]=
 #define MSGTR_ConnToServer "Sunucuya bağlanıldı: %s\n"
 #define MSGTR_FileNotFound "Dosya bulunamadı: '%s'\n"
 
-#define MSGTR_SMBInitError "libsmbclient kütüphanesi çalıştırılamadı: %d\n"
+#define MSGTR_SMBInitError "libsmbclient kütüphanesi başlatılamadı: %d\n"
-#define MSGTR_SMBFileNotFound "Ağdan açılamadı: '%s'\n"
+#define MSGTR_SMBFileNotFound "Yerel ağdan açılamadı: '%s'\n"
 #define MSGTR_SMBNotCompiled "MPlayer SMB okuma desteği ile derlenilmedi.\n"
 
-#define MSGTR_CantOpenDVD "DVD sürücüsü açılamadı: %s\n"
+#define MSGTR_CantOpenDVD "DVD sürücüsü açılamadı: %s (%s)\n"
 
 // stream_dvd.c
+#define MSGTR_DVDspeedCantOpen "DVD aygıtı yazma için açılamadı, DVD hızını değiştirme yazma izni gerektirir.\n"
+#define MSGTR_DVDrestoreSpeed "DVD hızı kaydediliyor... "
+#define MSGTR_DVDlimitSpeed "DVD hızı şu değerle sınırlandırılıyor: %dKB/s... "
+#define MSGTR_DVDlimitFail "başarısız\n"
+#define MSGTR_DVDlimitOk "başarılı\n"
 #define MSGTR_NoDVDSupport "Mplayer DVD desteği olmadan derlendi, çık\n"
-#define MSGTR_DVDnumTitles "Bu DVD üzerinde %d başlıkları var.\n"
+#define MSGTR_DVDnumTitles "Bu DVD üzerinde %d tane başlık var.\n"
 #define MSGTR_DVDinvalidTitle "Geçersiz DVD başlık numarası: %d\n"
 #define MSGTR_DVDnumChapters "Bu DVD başlığında %d bölüm var.\n"
 #define MSGTR_DVDinvalidChapter "Geçersiz DVD bölüm numarası: %d\n"
@@ -554,24 +590,32 @@ static char help_text[]=
 #define MSGTR_TooManyVideoInBuffer "\nAYRIŞTIRICI: Tamponda birçok  (%d - %d baytta) video paketi var!\n"
 #define MSGTR_MaybeNI "Boşluksuz AVI yayını/dosyası oynatıyor olabilirsiniz veya kodek hatalı?\n" \
 		      "AVI dosyaları için -ni seçeneğiyle boşluksuz modu zorlamayı deneyiniz.\n"
+#define MSGTR_WorkAroundBlockAlignHeaderBug "AVI: CBR-MP3 nBlockAlign başlık hatası etrafına çalışıyor!\n"
 #define MSGTR_SwitchToNi "\nHatalı boşluklandırılmış .AVI saptandı  -ni moduna geçiliyor...\n"
+#define MSGTR_InvalidAudioStreamNosound "AVI: geçersiz ses akışı ID: %d - gözardı ediliyor (ses yok)\n"
+#define MSGTR_InvalidAudioStreamUsingDefault "AVI: geçersiz görüntü akışı ID: %d - gözardı ediliyor\n"\
+" (varsayılan kullanılıyor)\n"
+#define MSGTR_ON2AviFormat "ON2 AVI biçimi"
 #define MSGTR_Detected_XXX_FileFormat "%s dosya biçimi bulundu!\n"
 #define MSGTR_DetectedAudiofile "Ses dosyası bulundu !\n"
 #define MSGTR_NotSystemStream "MPEG Sistem Yayın biçimi değil...(İletim yayını olabilir?)\n"
 #define MSGTR_InvalidMPEGES "Geçersiz MPEG-ES biçimi??? Geliştiricilere bildiriniz, bu bir hata olabilir.:(\n"
 #define MSGTR_FormatNotRecognized "============ Üzgünüm, bu dosya biçimi desteklenmiyor  ===========\n"\
 				  "=== Dosya bir AVI,ASF veya MPEG yayın biçimi ise, lütfen geliştiricilere bildiriniz. ===\n"
+#define MSGTR_SettingProcessPriority "İşlem önceliği ayarlanıyor: %s\n"
+#define MSGTR_FilefmtFourccSizeFpsFtime "[V] filefmt:%d  fourcc:0x%X  boyut:%dx%d  fps:%5.2f  ftime:=%6.4f\n"
+#define MSGTR_CannotInitializeMuxer "Cannot initialize muxer."
 #define MSGTR_MissingVideoStream "Video yayını bulunamadı!\n"
 #define MSGTR_MissingAudioStream "Ses yayını bulunamadı...  ->  ses yok\n"
-#define MSGTR_MissingVideoStreamBug "Hatalı video yayını! Lütfen geliştiricilere bildiriniz, bu bir hata olabilir. \n"
+#define MSGTR_MissingVideoStreamBug "Eksik video yayını? Lütfen geliştiricilere bildiriniz, bu bir hata olabilir :(\n"
 
 #define MSGTR_DoesntContainSelectedStream "ayrıştırma: Dosya seçili video veya ses yayınını içermiyor.\n"
 
 #define MSGTR_NI_Forced "Zorlandı"
-#define MSGTR_NI_Detected "Bulundu"
+#define MSGTR_NI_Detected "Saptandı"
 #define MSGTR_NI_Message "%s BOŞLUKSUZ AVI dosya biçimi.\n"
 
-#define MSGTR_UsingNINI "BOŞLUKSUZ bölünmüş AVI dosya-biçimi kullanılıyor!\n"
+#define MSGTR_UsingNINI "BOŞLUKSUZ bozuk AVI dosya-biçimi kullanılıyor!\n"
 #define MSGTR_CouldntDetFNo "Kare(Frame) numaraları saptanamadı (sadece arama için)  \n"
 #define MSGTR_CantSeekRawAVI "Raw AVI yayınında aranamıyor! (İndeks zorunlu, -idx  komutuyla deneyiniz!)  \n"
 #define MSGTR_CantSeekFile "Bu dosyada aranamıyor!  \n"
@@ -589,6 +633,7 @@ static char help_text[]=
 #define MSGTR_OpeningAudioDemuxerFailed "Ses ayrıştırıcısı açılamadı: %s\n"
 #define MSGTR_OpeningSubtitlesDemuxerFailed "Altyazı ayrıştırıcısı açılamadı: %s\n"
 #define MSGTR_TVInputNotSeekable "TV girdisi aranabilir değil! (Muhtemelen arama kanal değiştirmek için yapılacak ;)\n"
+#define MSGTR_DemuxerInfoChanged "Çözücü bilgisi %s şuna çevrildi: %s\n"
 #define MSGTR_ClipInfo "Klip bilgisi: \n"
 
 #define MSGTR_LeaveTelecineMode "\nBulunan içerik demux_mpg: 30000/1001fps NTSC, kare oranı değiştiriliyor.\n"
@@ -598,6 +643,10 @@ static char help_text[]=
 #define MSGTR_NoBindFound "'%s' tuşu için bağ bulunamadı "
 #define MSGTR_FailedToOpen "%s açılamadı\n"
 
+#define MSGTR_VideoID "[%s] Görüntü akışı bulundu, -vid %d\n"
+#define MSGTR_AudioID "[%s] ses akışı bulundu, -aid %d\n"
+#define MSGTR_SubtitleID "[%s] Altyazı akışı bulundu, -sid %d\n"
+
 // dec_video.c & dec_audio.c:
 #define MSGTR_CantOpenCodec "kodek açılamadı\n"
 #define MSGTR_CantCloseCodec "kodek kapatılamadı\n"
@@ -649,6 +698,7 @@ static char help_text[]=
 // vd.c
 #define MSGTR_CodecDidNotSet "VDec: Kodek ayarlanamadı: sh->disp_w ve sh->disp_h, çözülmeye çalışılıyor!\n"
 #define MSGTR_VoConfigRequest "VDec: vo ayar isteği - %d x %d (tercih csp: %s)\n"
+#define MSGTR_UsingXAsOutputCspNoY "VDec: çıkış csp'si olarak %s kullanılıyor (%d yok)\n"
 #define MSGTR_CouldNotFindColorspace "Renk biçimi bulunamadı.  -vf scale ile tekrar deneniyor...\n"
 #define MSGTR_MovieAspectIsSet "Video-Görünümü: %.2f:1 - doğru video görünümü için önölçekleniyor.\n"
 #define MSGTR_MovieAspectUndefined "Video-Görünümü tanımsız - önölçekleme onaylanamadı.\n"
@@ -665,6 +715,7 @@ static char help_text[]=
 
 #define MSGTR_InsertingAfVolume "[Karıştırıcı] Karıştırma donanımı yok, ses filtresi ekleniyor.\n"
 #define MSGTR_NoVolume "[Karıştırıcı] Kullanılabilir ses kontrolü yok.\n"
+#define MSGTR_NoBalance "[Karıştırıcı] Kullanılabilir denge kontrolü yok.\n"
 
 // ====================== GUI messages/buttons ========================
 
@@ -845,6 +896,10 @@ static char help_text[]=
 #define MSGTR_PREFERENCES_SUB_MPSUB "Mevcut altyazıyı MPlayer'ın altyazı biçimine çevir"
 #define MSGTR_PREFERENCES_SUB_SRT "Mevcut altyazıyı zaman tabanlı SubViewer (SRT) biçimine çevir"
 #define MSGTR_PREFERENCES_SUB_Overlap "Altyazı bindirmesini sabitle"
+#define MSGTR_PREFERENCES_SUB_USE_ASS "SSA/ASS altyazısı dönüştürülüyor"
+#define MSGTR_PREFERENCES_SUB_ASS_USE_MARGINS "Kenar boşluğu kullanın"
+#define MSGTR_PREFERENCES_SUB_ASS_TOP_MARGIN "Tepe: "
+#define MSGTR_PREFERENCES_SUB_ASS_BOTTOM_MARGIN "Dip: "
 #define MSGTR_PREFERENCES_Font "Yazıtipi:"
 #define MSGTR_PREFERENCES_FontFactor "Yazıtipi çarpanı:"
 #define MSGTR_PREFERENCES_PostProcess "postprocessing filtresini etkinleştir"
@@ -888,6 +943,7 @@ static char help_text[]=
 #define MSGTR_PREFERENCES_FontEncoding20 "Tayca karakterseti (CP874)"
 #define MSGTR_PREFERENCES_FontEncoding21 "Kiril Windows (CP1251)"
 #define MSGTR_PREFERENCES_FontEncoding22 "Slavca/Orta Avrupa Windows (CP1250)"
+#define MSGTR_PREFERENCES_FontEncoding23 "Arapça Windows (CP1256)"
 #define MSGTR_PREFERENCES_FontNoAutoScale "Otomatik boyutlandırma yok"
 #define MSGTR_PREFERENCES_FontPropWidth "Genişliği orantıla"
 #define MSGTR_PREFERENCES_FontPropHeight "Yüksekligi orantıla"
@@ -1031,6 +1087,7 @@ static char help_text[]=
 #define MSGTR_VO_SUB_Volume "Ses"
 #define MSGTR_VO_SUB_Brightness "Parlaklık"
 #define MSGTR_VO_SUB_Hue "Renk"
+#define MSGTR_VO_SUB_Balance "Denge"
 
 // vo_xv.c
 #define MSGTR_VO_XV_ImagedimTooHigh "Kaynak görüntü boyutları çok yüksek: %ux%u (maximum is %ux%u)\n"
@@ -1142,6 +1199,60 @@ static char help_text[]=
 #define MSGTR_AO_ALSA5_WriteErrorAfterReset "[AO ALSA5] alsa-oynat: yeniden başlatma sonrası yazma hatası: %s - vazgeçiliyor.\n"
 #define MSGTR_AO_ALSA5_OutPutError "[AO ALSA5] alsa-oynat: çıktı hatası: %s\n"
 
+// ao_alsa.c
+#define MSGTR_AO_ALSA_InvalidMixerIndexDefaultingToZero "[AO_ALSA] Geçersiz karıştırıcı içeriği. Varsayılan olarak 0. yapılıyor\n"
+#define MSGTR_AO_ALSA_MixerOpenError "[AO_ALSA] Karıştırıcı açma hatası: %s\n"
+#define MSGTR_AO_ALSA_MixerAttachError "[AO_ALSA] Karıştırıcı ekleme %s hatası: %s\n"
+#define MSGTR_AO_ALSA_MixerRegisterError "[AO_ALSA] Karıştırıcı kayıt hatası: %s\n"
+#define MSGTR_AO_ALSA_MixerLoadError "[AO_ALSA] Katıştırıcı yükleme hatası: %s\n"
+#define MSGTR_AO_ALSA_UnableToFindSimpleControl "[AO_ALSA] Basit kontrol bulunamıyor '%s',%i.\n"
+#define MSGTR_AO_ALSA_ErrorSettingLeftChannel "[AO_ALSA] Sol kanal ayarlamada hata, %s\n"
+#define MSGTR_AO_ALSA_ErrorSettingRightChannel "[AO_ALSA] Sağ kanal ayarlamada hata, %s\n"
+#define MSGTR_AO_ALSA_CommandlineHelp "\n[AO_ALSA] -ao alsa komut satırı yardımı:\n"\
+"[AO_ALSA] Örnek: mplayer -ao alsa:device=hw=0.3\n"\
+"[AO_ALSA]   İlk kart, dördüncü donanım aygıtını ayarlar.\n\n"\
+"[AO_ALSA] Seçenekler:\n"\
+"[AO_ALSA]   noblock\n"\
+"[AO_ALSA]     Aygıtı bloksuz modda açar.\n"\
+"[AO_ALSA]   device=<aygıt-adı>\n"\
+"[AO_ALSA]     Aygıtı ayarlar (',' '.' olarak ve ':' '=' değiştirilmeli)\n"
+#define MSGTR_AO_ALSA_ChannelsNotSupported "[AO_ALSA] %d tane kanal desteklenmiyor.\n"
+#define MSGTR_AO_ALSA_OpenInNonblockModeFailed "[AO_ALSA] Bloksuz modda açılamadı, bloklu modda açma deneniyor.\n"
+#define MSGTR_AO_ALSA_PlaybackOpenError "[AO_ALSA] Çalma açma hatası: %s\n"
+#define MSGTR_AO_ALSA_ErrorSetBlockMode "[AL_ALSA] Blok modu ayarlarken hata %s.\n"
+#define MSGTR_AO_ALSA_UnableToGetInitialParameters "[AO_ALSA] Başlangıç parametreeri alınamadı: %s\n"
+#define MSGTR_AO_ALSA_UnableToSetAccessType "[AO_ALSA] Erişim türü ayarlanamadı: %s\n"
+#define MSGTR_AO_ALSA_FormatNotSupportedByHardware "[AO_ALSA] Biçim %s donanım tarafından desteklenmiyor, varsayılan deneniyor.\n"
+#define MSGTR_AO_ALSA_UnableToSetFormat "[AO_ALSA] Format ayarlanamıyor: %s\n"
+#define MSGTR_AO_ALSA_UnableToSetChannels "[AO_ALSA] Kanallar ayarlanamıyor: %s\n"
+#define MSGTR_AO_ALSA_UnableToDisableResampling "[AO_ALSA] Tekrar örnekleme ayarlanamıyor: %s\n"
+#define MSGTR_AO_ALSA_UnableToSetSamplerate2 "[AO_ALSA] Örnekleme-oranı-2 ayarlanamıyor: %s\n"
+#define MSGTR_AO_ALSA_UnableToSetBufferTimeNear "[AO_ALSA] Buffer zamanı şu civarda ayarlanamıyor: %s\n"
+#define MSGTR_AO_ALSA_UnableToSetPeriodTime "[AO_ALSA] Şu zaman periyodu ayarlanamıyor: %s\n"
+#define MSGTR_AO_ALSA_BufferTimePeriodTime "[AO_ALSA] buffer_time: %d, period_time :%d\n"
+#define MSGTR_AO_ALSA_UnableToGetPeriodSize "[AO ALSA] Periyot boyutu alınamıyor: %s\n"
+#define MSGTR_AO_ALSA_UnableToSetPeriodSize "[AO ALSA] Periyot boyutu ayarlanamıyor(%ld): %s\n"
+#define MSGTR_AO_ALSA_UnableToSetPeriods "[AO_ALSA] Periyotlar ayarlanamıyor: %s\n"
+#define MSGTR_AO_ALSA_UnableToSetHwParameters "[AO_ALSA] hw-parameters ayarlanamıyor: %s\n"
+#define MSGTR_AO_ALSA_UnableToGetBufferSize "[AO_ALSA] buffersize alınamıyor: %s\n"
+#define MSGTR_AO_ALSA_UnableToGetSwParameters "[AO_ALSA] sw-parameters alınamıyor: %s\n"
+#define MSGTR_AO_ALSA_UnableToSetSwParameters "[AO_ALSA] sw-parameters ayarlanamıyor: %s\n"
+#define MSGTR_AO_ALSA_UnableToGetBoundary "[AO_ALSA] Sınır alınamıyor: %s\n"
+#define MSGTR_AO_ALSA_UnableToSetStartThreshold "[AO_ALSA] Eşik başlaması ayarlanamıyor: %s\n"
+#define MSGTR_AO_ALSA_UnableToSetStopThreshold "[AO_ALSA] Eşik bitişi ayarlanamıyor: %s\n"
+#define MSGTR_AO_ALSA_UnableToSetSilenceSize "[AO_ALSA] Sessizlik boyutu ayarlanamıyor: %s\n"
+#define MSGTR_AO_ALSA_PcmCloseError "[AO_ALSA] pcm kapatma hatası: %s\n"
+#define MSGTR_AO_ALSA_NoHandlerDefined "[AO_ALSA] Hiçbir handler tanımlanmamış!\n"
+#define MSGTR_AO_ALSA_PcmPrepareError "[AO_ALSA] pcm hazırlama hatası: %s\n"
+#define MSGTR_AO_ALSA_PcmPauseError "[AO_ALSA] pcm duraksama hatası: %s\n"
+#define MSGTR_AO_ALSA_PcmDropError "[AO_ALSA] pcm bırakma hatası: %s\n"
+#define MSGTR_AO_ALSA_PcmResumeError "[AO_ALSA] pcm devam hatası: %s\n"
+#define MSGTR_AO_ALSA_DeviceConfigurationError "[AO_ALSA] Aygıt ayarı hatası."
+#define MSGTR_AO_ALSA_PcmInSuspendModeTryingResume "[AO_ALSA] Pcm uyku modunda, devam etmeye çalışıyor.\n"
+#define MSGTR_AO_ALSA_WriteError "[AO_ALSA] Yazma hatası: %s\n"
+#define MSGTR_AO_ALSA_TryingToResetSoundcard "[AO_ALSA] Ses kartını sıfırlamaya çalışıyor.\n"
+#define MSGTR_AO_ALSA_CannotGetPcmStatus "[AO_ALSA] pcm durumu alınamıyor: %s\n"
+
 // ao_plugin.c
 
 #define MSGTR_AO_PLUGIN_InvalidPlugin "[AO PLUGIN] geçersiz ekyazılım(plugin): %s\n"
@@ -1149,6 +1260,7 @@ static char help_text[]=
 // ======================= AF Audio Filters ================================
 
 // libaf 
+#define MSGTR_AF_ValueOutOfRange MSGTR_VO_ValueOutOfRange
 
 // af_ladspa.c
 
@@ -1261,6 +1373,8 @@ static char help_text[]=
 #define MSGTR_MPDEMUX_ASFHDR_NoDataChunkAfterHeader "Belirtilen başlık için yığın(chunk) verisi yok!\n"
 #define MSGTR_MPDEMUX_ASFHDR_AudioVideoHeaderNotFound "ASF: ses ve video başlıkları bulunamadı - bozuk dosya?\n"
 #define MSGTR_MPDEMUX_ASFHDR_InvalidLengthInASFHeader "ASF başlığında geçersiz uzunluk!\n"
+#define MSGTR_MPDEMUX_ASFHDR_DRMLicenseURL "DRM Lisansı URL'si: %s\n"
+#define MSGTR_MPDEMUX_ASFHDR_DRMProtected "Bu dosya DRM şifrelemesiyle ipoteklenmiş, MPlayer'da çalınmaz!\n"
 
 // asf_mmst_streaming.c
 
@@ -1432,6 +1546,29 @@ static char help_text[]=
 
 #define MSGTR_MPDEMUX_DEMUXERS_FillBufferError "tampon_doyum hatası: hatalı ayrıştırıcı: vd değil, ad veya sd.\n"
 
+// demux_mkv.c
+#define MSGTR_MPDEMUX_MKV_ZlibInitializationFailed "[mkv] zlib başlatması başarısız.\n"
+#define MSGTR_MPDEMUX_MKV_ZlibDecompressionFailed "[mkv] zlib çıkarması başarısız.\n"
+#define MSGTR_MPDEMUX_MKV_LzoInitializationFailed "[mkv] lzo başlatması başarısız.\n"
+#define MSGTR_MPDEMUX_MKV_LzoDecompressionFailed "[mkv] lzo çıkarması başarısız.\n"
+#define MSGTR_MPDEMUX_MKV_TrackEncrypted "[mkv] %u numaralı parça şifrelenmiş ve şifre çözümü henüz\n[mkv] içeriğe alnmamış. Parça atlanıyor.\n"
+#define MSGTR_MPDEMUX_MKV_UnknownContentEncoding "[mkv] %u numaralı parça için bilinmeyen içerik şifrelemesi. Parça atlanıyor.\n"
+#define MSGTR_MPDEMUX_MKV_UnknownCompression "[mkv] %u numaralı parça bilinmeyen/desteklenmeyen bir algoritmayla sıkıştırılmış\n[mkv] (%u). Parça atlanıyor.\n"
+#define MSGTR_MPDEMUX_MKV_ZlibCompressionUnsupported "[mkv] %u numaralı parça zlib ile sıkıştırılmış fakat mplayer henüz derlenmemiş zlib sıkıştırma desteğiyle\n[mkv]. Parça atlanıyor.\n"
+#define MSGTR_MPDEMUX_MKV_TrackIDName "[mkv] Parça ID %u: %s (%s) \"%s\", %s\n"
+#define MSGTR_MPDEMUX_MKV_TrackID "[mkv] Parça ID %u: %s (%s), %s\n"
+#define MSGTR_MPDEMUX_MKV_UnknownCodecID "[mkv] Bilinmeyen/desteklenmeyen CodecID (%s) veya eksik/bozuk CodecPrivate\n[mkv] verisi (parça %u).\n"
+#define MSGTR_MPDEMUX_MKV_FlacTrackDoesNotContainValidHeaders "[mkv] FLAC parçası geçerli başlıklar içermiyor.\n"
+#define MSGTR_MPDEMUX_MKV_UnknownAudioCodec "[mkv] Bilinmeyen/desteklenmeyen ses kodeği ID '%s', %u numaralı parça için   veya eksik/hatalı\n[mkv] özel kodek verisi.\n"
+#define MSGTR_MPDEMUX_MKV_SubtitleTypeNotSupported "[mkv] '%s' altyazı türü desteklenmiyor.\n"
+#define MSGTR_MPDEMUX_MKV_WillPlayVideoTrack "[mkv] %u numaralı görüntü parçası çalınacak.\n"
+#define MSGTR_MPDEMUX_MKV_NoVideoTrackFound "[mkv] Hiçbir görüntü parçası bulunmadı/istenmedi.\n"
+#define MSGTR_MPDEMUX_MKV_NoAudioTrackFound "[mkv] Hiçbir ses parçası bulunmadı/istenmedi.\n"
+#define MSGTR_MPDEMUX_MKV_WillDisplaySubtitleTrack "[mkv] %u numaralı altyazı parçası görüntülenecek.\n"
+#define MSGTR_MPDEMUX_MKV_NoBlockDurationForSubtitleTrackFound "[mkv] Uyarı: Altyazı parçası için hiçbir BlockDuration bulunamadı.\n"
+#define MSGTR_MPDEMUX_MKV_TooManySublines "[mkv] Uyarı: İşlenecek çok fazla altyazı var, atlanıyor.\n"
+#define MSGTR_MPDEMUX_MKV_TooManySublinesSkippingAfterFirst "\n[mkv] Uyarı: İşlenecek çok fazla altyazı var, ilk %i den sonra atlanıyor.\n"
+
 // demux_nuv.c
 
 #define MSGTR_MPDEMUX_NUV_NoVideoBlocksInFile "Dosyada video blokları yok.\n"
@@ -1440,6 +1577,7 @@ static char help_text[]=
 
 #define MSGTR_MPDEMUX_XMMS_FoundPlugin "Ekyazılım(plugin) bulundu: %s (%s).\n"
 #define MSGTR_MPDEMUX_XMMS_ClosingPlugin "Ekyazılım(plugin) kapatılıyor: %s.\n"
+#define MSGTR_MPDEMUX_XMMS_WaitForStart "XMMS ekyazılımının(plugin) şunu çalmaya başlaması bekleniyor: '%s'...\n"
 
 // ========================== LIBMPMENU ===================================
 
@@ -1481,6 +1619,7 @@ static char help_text[]=
 
 // libmenu/menu_param.c
 #define MSGTR_LIBMENU_SubmenuDefinitionNeedAMenuAttribut "[MENU] Altmenü tanımı bir 'menü' özelliği gerektiriyor.\n"
+#define MSGTR_LIBMENU_InvalidProperty "[MENU] Tercihler menü girişinde geçersiz özellik '%s' (satır %d).\n"
 #define MSGTR_LIBMENU_PrefMenuEntryDefinitionsNeed "[MENU] Tercihler menü girişi geçerli bir 'sahiplik' özelliği gerektiriyor. (satır %d).\n"
 #define MSGTR_LIBMENU_PrefMenuNeedsAnArgument "[MENU] Tercihler menüsü için bir değişken gerekiyor.\n"
 
@@ -1583,6 +1722,10 @@ static char help_text[]=
 #define MSGTR_LIBVO_3DFX_DisplayInitialized "[VO_3DFX] Başlatıldı: %p.\n"
 #define MSGTR_LIBVO_3DFX_UnknownSubdevice "[VO_3DFX] Bilinmeyen altaygıt: %s.\n"
 
+// libvo/aspect.c
+#define MSGTR_LIBVO_ASPECT_NoSuitableNewResFound "[ASPECT] Uyarı: Hiçbir uygun yeni çözünürlük bulunamadı!\n"
+#define MSGTR_LIBVO_ASPECT_NoNewSizeFoundThatFitsIntoRes "[ASPECT] Hata: Çözünürlüğe uygun hiçbir yeni boyut bulunamadı!\n"
+
 // libvo/vo_dxr3.c
 
 #define MSGTR_LIBVO_DXR3_UnableToLoadNewSPUPalette "[VO_DXR3] Yeni SPU paleti yüklenemedi!\n"
@@ -1631,6 +1774,17 @@ static char help_text[]=
 #define MSGTR_LIBVO_DXR3_XCorrection "[VO_DXR3] X-düzeltimi: %d.\n"
 #define MSGTR_LIBVO_DXR3_FailedSetSignalMix "[VO_DXR3] Sinyal karıştırma ayarlanamadı!\n"
 
+// libvo/font_load_ft.c
+
+#define MSGTR_LIBVO_FONT_LOAD_FT_NewFaceFailed "New_Face başarısız. Yazıtipi yolu yanlış olabilir.\nLütfen yazıtipi dosyasını sağlayın (~/.mplayer/subfont.ttf).\n"
+#define MSGTR_LIBVO_FONT_LOAD_FT_NewMemoryFaceFailed "New_Memory_Face başarısız..\n"
+#define MSGTR_LIBVO_FONT_LOAD_FT_SubFaceFailed "subtitle font: load_sub_face başarısız.\n"
+#define MSGTR_LIBVO_FONT_LOAD_FT_SubFontCharsetFailed "subtitle font: prepare_charset başarısız.\n"
+#define MSGTR_LIBVO_FONT_LOAD_FT_CannotPrepareSubtitleFont "Altyazı yazıtipi hazırlanamıyor.\n"
+#define MSGTR_LIBVO_FONT_LOAD_FT_CannotPrepareOSDFont "OSD yazıtipi hazırlanamıyor.\n"
+#define MSGTR_LIBVO_FONT_LOAD_FT_CannotGenerateTables "Tablolar oluşturulamıyor.\n"
+#define MSGTR_LIBVO_FONT_LOAD_FT_DoneFreeTypeFailed "FT_Done_FreeType başarısız.\n"
+
 // libvo/vo_mga.c
 
 #define MSGTR_LIBVO_MGA_AspectResized "[VO_MGA] aspect(): %dx%d olarak tekrar boyutlandırılıyor.\n"
@@ -1785,10 +1939,31 @@ static char help_text[]=
 // libvo/vo_xv.c
 
 #define MSGTR_LIBVO_XV_DrawFrameCalled "[VO_XV] draw_frame() çağrıldı!!!!!!\n"
+#define MSGTR_LIBVO_XV_SharedMemoryNotSupported "[VO_XV] Bellek paylaşımı desteklenmiyor\nNormale döndürülüyor Xv.\n"
+#define MSGTR_LIBVO_XV_XvNotSupportedByX11 "[VO_XV] Özür, Xv bu X11 versiyonu/sürücüsü tarafından desteklenmiyor\n[VO_XV] ********  -vo x11  veya  -vo sdl ile deneyin  *********\n"
+#define MSGTR_LIBVO_XV_XvQueryAdaptorsFailed  "[VO_XV] XvQueryAdaptors başarısız.\n"
+#define MSGTR_LIBVO_XV_InvalidPortParameter "[VO_XV] Geçersiz port parametresi, port 0 ile üstünden geçiyor.\n"
+#define MSGTR_LIBVO_XV_CouldNotGrabPort "[VO_XV] Port %i ele geçirilemedi.\n"
+#define MSGTR_LIBVO_XV_CouldNotFindFreePort "[VO_XV] Boş Xvideo portu bulunamadı - başka bir program halihazırda kullanıyor\n"\
+"[VO_XV] olabilir. Tüm görüntü uygulamalarını kapatıp tekrar deeyin. Eğer bu\n"\
+"[VO_XV] yardımcı olmazsa, diğer görüntü çıkış sürücüleri (xv-olmayan) için\n"\
+" 'mplayer -vo help' komutunu deneyin\n"
+#define MSGTR_LIBVO_XV_NoXvideoSupport "[VO_XV] Ekran kartınız için uygun Xvideo desteği yok gibi görünüyor.\n"\
+"[VO_XV] kartınızın Xv desteğini onaylamak için 'xvinfo' komutunu girip \n"\
+"[VO_XV] DOCS/HTML/en/video.html#xv! dosyasını okuyun\n"\
+"[VO_XV] Diğer görüntü çıkış sürücüleri(xv-olmayan) için 'mplayer -vo help' komutuna bakın.\n"\
+"[VO_XV] -vo x11 komutunu deneyin.\n"
+
+
+// loader/ldt_keeper.c
+
+#define MSGTR_LOADER_DYLD_Warning "WARNING: Attempting to use DLL codecs but environment variable\n         DYLD_BIND_AT_LAUNCH not set. This will likely crash.\n"
+
 
 // stream/stream_radio.c
 
 #define MSGTR_RADIO_ChannelNamesDetected "[radio] Radyo kanal adları bulundu.\n"
+#define MSGTR_RADIO_FreqRange "[radio] İzin verilen frekans aralığı şu: %.2f-%.2f MHz.\n"
 #define MSGTR_RADIO_WrongFreqForChannel "[radio] %s kanalı için yanlış frekans.\n"
 #define MSGTR_RADIO_WrongChannelNumberFloat "[radio] %.2f yanlış kanal numarası.\n"
 #define MSGTR_RADIO_WrongChannelNumberInt "[radio] %d yanlış kanal numarası.\n"
@@ -1824,7 +1999,172 @@ static char help_text[]=
 #define MSGTR_RADIO_CaptureStarting "[radio] Ivır zıvırı kayıtetme başlıyor.\n"
 #define MSGTR_RADIO_ClearBufferFailed "[radio] %s: Ara belleği temizleme başarılamadı."
 #define MSGTR_RADIO_StreamEnableCacheFailed "[radio] %s: stream_enable_cache çağrısı başarılamadı."
-#define MSGTR_RADIO_DriverUnknownId "[radio] Bilinmeyen sürücü kimliği: %d\n"
 #define MSGTR_RADIO_DriverUnknownStr "[radio] Bilinmeyen sürücü adı: %s\n"
 #define MSGTR_RADIO_DriverV4L2 "[radio] V4Lv2 radyo görünümü kullanılıyor.\n"
 #define MSGTR_RADIO_DriverV4L "[radio] V4Lv1 radyo görünümü kullanılıyor.\n"
+#define MSGTR_RADIO_DriverBSDBT848 "[radio] *BSD BT848 radyo arayüzü kullanılıyor.\n"
+#define MSGTR_RADIO_AvailableDrivers "[radio] kullanılabilir sürücüler: "
+
+// ================================== LIBASS ====================================
+
+// ass_bitmap.c
+#define MSGTR_LIBASS_FT_Glyph_To_BitmapError "[ass] FT_Glyph_To_Bitmap hatası %d \n"
+#define MSGTR_LIBASS_UnsupportedPixelMode "[ass] Desteklenmeyen piksel modu: %d\n"
+#define MSGTR_LIBASS_GlyphBBoxTooLarge "[ass] Glyph sınırlandırıcı kutusu çok büyük: %dx%dpx\n"
+
+// ass.c
+#define MSGTR_LIBASS_NoStyleNamedXFoundUsingY "[ass] [%p] Uyarı: '%s' isminde bir tarz bulunamadı, '%s' kullanılıyor\n"
+#define MSGTR_LIBASS_BadTimestamp "[ass] Bozuk zaman damgası\n"
+#define MSGTR_LIBASS_BadEncodedDataSize "[ass] Bozuk şifreli veri boyutu\n"
+#define MSGTR_LIBASS_FontLineTooLong "[ass] Yazıtipi çizgisi çok uzun: %d, %s\n"
+#define MSGTR_LIBASS_EventFormatHeaderMissing "[ass] Olay biçim başlığı eksik\n"
+#define MSGTR_LIBASS_ErrorOpeningIconvDescriptor "[ass] iconv tanımlayıcısını açmada hata.\n"
+#define MSGTR_LIBASS_ErrorRecodingFile "[ass] Dosyayı tekrar kodlamada hata.\n"
+#define MSGTR_LIBASS_FopenFailed "[ass] ass_read_file(%s): fopen başarısız\n"
+#define MSGTR_LIBASS_FseekFailed "[ass] ass_read_file(%s): fseek başarısız\n"
+#define MSGTR_LIBASS_RefusingToLoadSubtitlesLargerThan10M "[ass] ass_read_file(%s): 10 megabayttan büyük altyazıları yüklemeyi reddediyor\n"
+#define MSGTR_LIBASS_ReadFailed "Okuma başarısız, %d: %s\n"
+#define MSGTR_LIBASS_AddedSubtitleFileMemory "[ass] Altyazı dosyasını ekledi: <bellek> (%d tarz, %d olay)\n"
+#define MSGTR_LIBASS_AddedSubtitleFileFname "[ass] Altyazı dosyasını ekledi: %s (%d tarz, %d olay)\n"
+#define MSGTR_LIBASS_FailedToCreateDirectory "[ass] Klasör oluşturulamadı %s\n"
+#define MSGTR_LIBASS_NotADirectory "[ass] Klasör değil: %s\n"
+
+// ass_cache.c
+#define MSGTR_LIBASS_TooManyFonts "[ass] Çok fazla yazıtipi\n"
+#define MSGTR_LIBASS_ErrorOpeningFont "[ass] Yazıtipini açarken hata: %s, %d\n"
+
+// ass_fontconfig.c
+#define MSGTR_LIBASS_SelectedFontFamilyIsNotTheRequestedOne "[ass] fontconfig: Seçilen yazıtipi ailesi istek yapılan değil: '%s' != '%s'\n"
+#define MSGTR_LIBASS_UsingDefaultFontFamily "[ass] fontconfig_select: Varsayılan yazıtipi ailesi kullanılıyor: (%s, %d, %d) -> %s, %d\n"
+#define MSGTR_LIBASS_UsingDefaultFont "[ass] fontconfig_select: Varsayılan yazıtipi kullanılıyor: (%s, %d, %d) -> %s, %d\n"
+#define MSGTR_LIBASS_UsingArialFontFamily "[ass] fontconfig_select: 'Arial' yazıtipi ailesi kullanılıyor: (%s, %d, %d) -> %s, %d\n"
+#define MSGTR_LIBASS_FcInitLoadConfigAndFontsFailed "[ass] FcInitLoadConfigAndFonts başarısız.\n"
+#define MSGTR_LIBASS_UpdatingFontCache "[ass] Yazıtipi tampon belleği güncelleniyor.\n"
+#define MSGTR_LIBASS_BetaVersionsOfFontconfigAreNotSupported "[ass] fontconfig'in beta versiyonları desteklenmiyor.\n[ass] Hata rapor etmeden önce güncelleyin.\n"
+#define MSGTR_LIBASS_FcStrSetAddFailed "[ass] FcStrSetAdd başarısız.\n"
+#define MSGTR_LIBASS_FcDirScanFailed "[ass] FcDirScan başarısız.\n"
+#define MSGTR_LIBASS_FcDirSave "[ass] FcDirSave başarısız.\n"
+#define MSGTR_LIBASS_FcConfigAppFontAddDirFailed "[ass] FcConfigAppFontAddDir başarısız\n"
+#define MSGTR_LIBASS_FontconfigDisabledDefaultFontWillBeUsed "[ass] Fontconfig devre dışı, sadece varsayılan yazıtipi kullanılacak.\n"
+#define MSGTR_LIBASS_FunctionCallFailed "[ass] %s başarısız\n"
+
+// ass_render.c
+#define MSGTR_LIBASS_NeitherPlayResXNorPlayResYDefined "[ass] Ne PlayResX, ne de PlayResY tanımlanmış. 384x288 varsayılıyor.\n"
+#define MSGTR_LIBASS_PlayResYUndefinedSettingY "[ass] PlayResY tanımsız, %d yapılıyor.\n"
+#define MSGTR_LIBASS_PlayResXUndefinedSettingX "[ass] PlayResX tanımsız, %d yapılıyor.\n"
+#define MSGTR_LIBASS_FT_Init_FreeTypeFailed "[ass] FT_Init_FreeType başarısız.\n"
+#define MSGTR_LIBASS_Init "[ass] Init\n"
+#define MSGTR_LIBASS_InitFailed "[ass] Init başarısız.\n"
+#define MSGTR_LIBASS_BadCommand "[ass] Bozuk komut: %c%c\n"
+#define MSGTR_LIBASS_ErrorLoadingGlyph  "[ass] glyph yüklenirken hata.\n"
+#define MSGTR_LIBASS_FT_Glyph_Stroke_Error "[ass] FT_Glyph_Stroke hatası %d \n"
+#define MSGTR_LIBASS_UnknownEffectType_InternalError "[ass] Bilinmeyen etki türü (dahili hata)\n"
+#define MSGTR_LIBASS_NoStyleFound "[ass] Hiçbir tarz bulunamadı!\n"
+#define MSGTR_LIBASS_EmptyEvent "[ass] Boş olay!\n"
+#define MSGTR_LIBASS_MAX_GLYPHS_Reached "[ass] MAX_GLYPHS'e ulaşıldı: olay %d, başlama = %llu, süre = %llu\n Metin = %s\n"
+#define MSGTR_LIBASS_EventHeightHasChanged "[ass] Uyarı! Olay yüksekliği değişti!  \n"
+
+// ass_font.c
+#define MSGTR_LIBASS_GlyphNotFoundReselectingFont "[ass] Glyph 0x%X bulunamadı, (%s, %d, %d) için tekrar yazıtipi seçiliyor\n"
+#define MSGTR_LIBASS_GlyphNotFound "[ass] Glyph 0x%X yazıtipinde bulunamadı, şunun için (%s, %d, %d) \n"
+#define MSGTR_LIBASS_ErrorOpeningMemoryFont "[ass] Belleği açmada hata, yazıtipi: %s\n"
+#define MSGTR_LIBASS_NoCharmaps "[ass] yazıtipinin karakter haritası yok\n"
+#define MSGTR_LIBASS_NoCharmapAutodetected "[ass] Hiçbir karakter haritası algılanmadı, ilki deneniyor\n"
+
+//tv.c
+#define MSGTR_TV_BogusNormParameter "tv.c: norm_from_string(%s): Dandik norm parametresi, %s olarak ayarlanıyor.\n"
+#define MSGTR_TV_NoVideoInputPresent "Hata: Hiçbir görüntü girişi mevcut değil!\n"
+#define MSGTR_TV_UnknownImageFormat ""\
+"==================================================================\n"\
+" UYARI: TEST EDİLMEMİŞ VEYA BİLİNMEYEN ÇIKTI RESİM BİÇİMİ İÇİN İSTEKTE BULUNULDU (0x%x)\n"\
+" Bu durum hatalı çalmaya veya programın göçmesine neden olabilir! Hata raporları\n"\
+" gözardı edilecek! YV12 ile tekrar denemelisiniz (varsayılan\n"\
+" renk uzayı) ve belgeleri okuyun!\n"\
+"==================================================================\n"
+#define MSGTR_TV_SelectedNormId "Seçilen norm id: %d\n"
+#define MSGTR_TV_SelectedNorm "Seçilen norm : %s\n"
+#define MSGTR_TV_CannotSetNorm "Hata: Norm ayarlanamıyor!\n"
+#define MSGTR_TV_MJP_WidthHeight "  MJP: genişlik %d yükseklik %d\n"
+#define MSGTR_TV_UnableToSetWidth "İstek yapılan genişlik ayarlanamıyor: %d\n"
+#define MSGTR_TV_UnableToSetHeight "İstek yapılan yükseklik ayarlanamıyor: %d\n"
+#define MSGTR_TV_NoTuner "Seçilen girişin bir ayarlayıcı yok!\n"
+#define MSGTR_TV_UnableFindChanlist "Seçilen kanal listesi bulunamıyor! (%s)\n"
+#define MSGTR_TV_SelectedChanlist "Seçilen kanal listesi: %s (%d kanal içeriyor)\n"
+#define MSGTR_TV_ChannelFreqParamConflict "Aynı anda frekans ve kanal ayarlanamaz!\n"
+#define MSGTR_TV_ChannelNamesDetected "TV kanal isimleri algılandı.\n"
+#define MSGTR_TV_NoFreqForChannel "%s kanalı için frekans bulunamadı (%s)\n"
+#define MSGTR_TV_SelectedChannel3 "Seçilen kanal: %s - %s (frekans: %.3f)\n"
+#define MSGTR_TV_SelectedChannel2 "Seçien kanal: %s (frekans: %.3f)\n"
+#define MSGTR_TV_SelectedFrequency "Seçilen frekans: %lu (%.3f)\n"
+#define MSGTR_TV_RequestedChannel "İstek yapılan kanal: %s\n"
+#define MSGTR_TV_UnsupportedAudioType "Ses tipi '%s (%x)' desteklenmiyor!\n"
+#define MSGTR_TV_AudioFormat "  TV sesi: %d tane kanal, %d bit, %d Hz\n"
+#define MSGTR_TV_AvailableDrivers "Kullanılabilir sürücüler:\n"
+#define MSGTR_TV_DriverInfo "Seçilen sürücü: %s\n isim: %s\n yazar: %s\n yorum: %s\n"
+#define MSGTR_TV_NoSuchDriver "Böyle bir sürücü yok: %s\n"
+#define MSGTR_TV_DriverAutoDetectionFailed "TV sürücü oto-algılama başarısız.\n"
+#define MSGTR_TV_UnknownColorOption "Bilinmeyen renk seçeneği (%d) belirtildi!\n"
+#define MSGTR_TV_CurrentFrequency "Şimdiki frekans: %lu (%.3f)\n"
+#define MSGTR_TV_NoTeletext "Teletext yok"
+#define MSGTR_TV_Bt848IoctlFailed "tvi_bsdbt848: %s ioctl çağrısı başarısız. Hata: %s\n"
+#define MSGTR_TV_Bt848InvalidAudioRate "tvi_bsdbt848: Geçersiz ses oranı. Hata: %s\n"
+#define MSGTR_TV_Bt848ErrorOpeningBktrDev "tvi_bsdbt848: bktr aygıtı açılamıyor. Hata: %s\n"
+#define MSGTR_TV_Bt848ErrorOpeningTunerDev "tvi_bsdbt848: Ayarlayıcı aygıt açılamıyor. Hata: %s\n"
+#define MSGTR_TV_Bt848ErrorOpeningDspDev "tvi_bsdbt848: dsp aygıtı açılamıyor. Hata: %s\n"
+#define MSGTR_TV_Bt848ErrorConfiguringDsp "tvi_bsdbt848: dsp ayarı başarısız. Hata: %s\n"
+#define MSGTR_TV_Bt848ErrorReadingAudio "tvi_bsdbt848: Ses verisini okumada hata. Hata: %s\n"
+#define MSGTR_TV_Bt848MmapFailed "tvi_bsdbt848: mmap başarısız. Hata: %s\n"
+#define MSGTR_TV_Bt848FrameBufAllocFailed "tvi_bsdbt848: Kare(frame) buffer ataması başarısız. Hata: %s\n"
+#define MSGTR_TV_Bt848ErrorSettingWidth "tvi_bsdbt848: Resim genişliğini ayarlamada hata. Hata: %s\n"
+#define MSGTR_TV_Bt848ErrorSettingHeight "tvi_bsdbt848: Resim yüksekliğini ayarlamada hata. Hata: %s\n"
+#define MSGTR_TV_Bt848UnableToStopCapture "tvi_bsdbt848: Yakalama durdurulamıyor. Hata: %s\n"
+#define MSGTR_TV_TTSupportedLanguages "Desteklenen Teletext dilleri:\n"
+#define MSGTR_TV_TTSelectedLanguage "Seçilen Teletext dili: %s\n"
+#define MSGTR_TV_ScannerNotAvailableWithoutTuner "Kanal tarayıcı ayarlayıcı olmadan kullanılamaz\n"
+
+//tvi_dshow.c
+#define MSGTR_TVI_DS_UnableConnectInputVideoDecoder  "Verilen giriş görüntü çözücüye bağlanamadı. Hata:0x%x\n"
+#define MSGTR_TVI_DS_UnableConnectInputAudioDecoder  "Verilen giriş ses çözücüye bağlanamadı. Hata:0x%x\n"
+#define MSGTR_TVI_DS_UnableSelectVideoFormat "tvi_dshow: Görüntü biçimi seçilemiyor. Hata:0x%x\n"
+#define MSGTR_TVI_DS_UnableSelectAudioFormat "tvi_dshow: Ses biçimi seçilemiyor. Hata:0x%x\n"
+#define MSGTR_TVI_DS_UnableGetMediaControlInterface "tvi_dshow: IMediaControl arayüzü alınamıyor. Hata:0x%x\n"
+#define MSGTR_TVI_DS_UnableStartGraph "tvi_dshow: Grafik başlatılamıyor! Hata:0x%x\n"
+#define MSGTR_TVI_DS_DeviceNotFound "tvi_dshow: Aygıt #%d bulunamadı\n"
+#define MSGTR_TVI_DS_UnableGetDeviceName "tvi_dshow: Aygıt #%d için isim alınamadı\n"
+#define MSGTR_TVI_DS_UsingDevice "tvi_dshow: Aygıt #%d kullanılıyor: %s\n"
+#define MSGTR_TVI_DS_DeviceName  "tvi_dshow: Aygıt #%d: %s\n"
+#define MSGTR_TVI_DS_DirectGetFreqFailed "tvi_dshow: Frekans doğrudan alınamadı. OS gömülü kanal tablosu kullanılacak.\n"
+#define MSGTR_TVI_DS_DirectSetFreqFailed "tvi_dshow: Frekans doğrudan ayarlanamadı. OS gömülü kanal tablosu kullanılacak.\n"
+#define MSGTR_TVI_DS_SupportedNorms "tvi_dshow: Desteklenen normlar:"
+#define MSGTR_TVI_DS_AvailableVideoInputs "tvi_dshow: Kullanılabilir görüntü girişleri:"
+#define MSGTR_TVI_DS_AvailableAudioInputs "tvi_dshow: Kullanılabilir ses girişleri:"
+//following phrase will be printed near the selected audio/video input
+#define MSGTR_TVI_DS_InputSelected "(seçildi)"
+#define MSGTR_TVI_DS_UnableExtractFreqTable "tvi_dshow: kstvtune.ax dosyasından frekans tablosu yüklenemedi\n"
+#define MSGTR_TVI_DS_WrongDeviceParam "tvi_dshow: Yanlış aygıt parametresi: %s\n"
+#define MSGTR_TVI_DS_WrongDeviceIndex "tvi_dshow: Yanlış aygıt indeksi: %d\n"
+#define MSGTR_TVI_DS_WrongADeviceParam "tvi_dshow: Yanlış aygıt(adevice) parametresi: %s\n"
+#define MSGTR_TVI_DS_WrongADeviceIndex "tvi_dshow: Yanlış aygıt(adevice) indeksi: %d\n"
+
+#define MSGTR_TVI_DS_SamplerateNotsupported "tvi_dshow: Örnekleme-oranı %d aygıt tarafından desteklenmiyor. İlk kullanılabilir olana dönülüyor.\n"
+#define MSGTR_TVI_DS_VideoAdjustigNotSupported "tvi_dshow: parlaklık/renk/doygunluk/karşıtlık ayarlaması aygıt tarafından desteklenmiyor\n"
+
+#define MSGTR_TVI_DS_ChangingWidthHeightNotSupported "tvi_dshow: Görüntü genişliği/yükseliği değişimi aygıt tarafından desteklenmiyor.\n"
+#define MSGTR_TVI_DS_SelectingInputNotSupported  "tvi_dshow: Yakalama kaynağının seçimi aygıt tarafından desteklenmiyor\n"
+#define MSGTR_TVI_DS_FreqTableLoaded "tvi_dshow: (%s) Frekans tablosu, ülke id=%d (kanallar:%d) için yüklendi.\n"
+#define MSGTR_TVI_DS_ErrorParsingAudioFormatStruct "tvi_dshow: Ses biçimi yapısı ayrıştırılamadı.\n"
+#define MSGTR_TVI_DS_ErrorParsingVideoFormatStruct "tvi_dshow: Görüntü biçimi yapısı ayrıştırılamadı.\n"
+#define MSGTR_TVI_DS_UnableSetAudioMode "tvi_dshow: Ses modu ayarlanamadı: %d. Hata:0x%x\n"
+#define MSGTR_TVI_DS_UnsupportedMediaType "tvi_dshow: Desteklenmeyen ortam tipi şuraya gönderildi: %s\n"
+#define MSGTR_TVI_DS_UnableGetsupportedVideoFormats "tvi_dshow: Görüntü pininden desteklenen ortam biçimleri alınamadı. Hata:0x%x\n"
+#define MSGTR_TVI_DS_UnableGetsupportedAudioFormats "tvi_dshow: Ses pininden desteklenen ortam biçimleri alınamadı. Hata:0x%x Disabling audio.\n"
+#define MSGTR_TVI_DS_UnableFindNearestChannel "tvi_dshow: Sistem frekans tablosunda en yakın kanal bulunamadı.\n"
+#define MSGTR_TVI_DS_UnableToSetChannel "tvi_dshow: Sistem frekans tablosundan en yakın kanala geçiş yapılamadı. Hata:0x%x\n"
+#define MSGTR_TVI_DS_UnableTerminateVPPin "tvi_dshow:  VideoPort pini grafikte filtrelerle bitirilemedi. Hata:0x%x\n"
+#define MSGTR_TVI_DS_UnableBuildVideoSubGraph "tvi_dshow: Yakalama grafiğinin görüntü zinciri oluşturulamadı. Hata:0x%x\n"
+#define MSGTR_TVI_DS_UnableBuildAudioSubGraph "tvi_dshow: Yakalama grafiğinin ses zinciri oluşturulamadı. Hata:0x%x\n"
+#define MSGTR_TVI_DS_UnableBuildVBISubGraph "tvi_dshow: Yakalama grafiğinin VBI zinciri oluşturulamadı. Hata:0x%x\n"
+#define MSGTR_TVI_DS_GraphInitFailure "tvi_dshow: Directshow grafik başlatılması hatası.\n"
+#define MSGTR_TVI_DS_NoVideoCaptureDevice "tvi_dshow: Görüntü yakalama aygıtı bulunamadı.\n"
+#define MSGTR_TVI_DS_NoAudioCaptureDevice "tvi_dshow: Ses yakalama aygıtı bulunamadı.\n"
+#define MSGTR_TVI_DS_GetActualMediatypeFailed "tvi_dshow: Asıl ortam tipi alınamadı (Hata:0x%x). İstek yapılana eşit olduğu varsayılıyor.\n"

libao2/Makefile

@@ -1,11 +0,0 @@
-include ../config.mak
-
-LIBNAME_MPLAYER = libao2.a
-
-SRCS_MPLAYER = audio_out.c \
-               ao_mpegpes.c \
-               ao_null.c \
-               ao_pcm.c \
-               $(AO_SRCS) \
-
-include ../mpcommon.mak

libmpdemux/Makefile

@@ -68,6 +68,6 @@ SRCS_MENCODER-$(LIBAVFORMAT)           += muxer_lavf.c
 
 include ../mpcommon.mak
 
-demux_lavf.o mp_taglists.o: CFLAGS += -I../libavcodec
+demux_lavf.o mp_taglists.o .depend: CFLAGS += -I../libavcodec
 
-dep depend: CFLAGS += $(EXTRAXX_INC)
+.depend: CFLAGS += $(EXTRAXX_INC)

libmpdemux/demux_avs.c

@@ -299,7 +299,7 @@ static demuxer_t* demux_open_avs(demuxer_t* demuxer)
         
         //sh_video->format = get_mmioFOURCC(AVS->video_info);
         sh_video->format = mmioFOURCC('Y', 'V', '1', '2');
-        sh_video->fps = (float) ((float) AVS->video_info->fps_numerator / (float) AVS->video_info->fps_denominator);
+        sh_video->fps = (double) AVS->video_info->fps_numerator / (double) AVS->video_info->fps_denominator;
         sh_video->frametime = 1.0 / sh_video->fps;
         
         sh_video->bih = malloc(sizeof(BITMAPINFOHEADER) + (256 * 4));
@@ -430,6 +430,8 @@ static void demux_seek_avs(demuxer_t *demuxer, float rel_seek_secs, float audio_
       sh_video->num_frames_decoded = AVS->frameno;
       sh_video->num_frames = AVS->frameno;
     }
+    video_pos += audio_delay;
+    if (video_pos < 0) video_pos = 0;
     if (sh_audio)
       AVS->sampleno = FFMIN(video_pos * sh_audio->samplerate,
                             AVS->video_info->num_audio_samples);

libmpdemux/mp_taglists.c

@@ -60,6 +60,7 @@ const struct AVCodecTag *mp_wav_override_taglists[] = {mp_wav_override_tags, 0};
 static const AVCodecTag mp_bmp_tags[] = {
     { CODEC_ID_AMV,               MKTAG('A', 'M', 'V', 'V')},
     { CODEC_ID_BETHSOFTVID,       MKTAG('B', 'E', 'T', 'H')},
+    { CODEC_ID_BFI,               MKTAG('B', 'F', 'I', 'V')},
     { CODEC_ID_C93,               MKTAG('C', '9', '3', 'V')},
     { CODEC_ID_DSICINVIDEO,       MKTAG('D', 'C', 'I', 'V')},
     { CODEC_ID_DXA,               MKTAG('D', 'X', 'A', '1')},

libvo/Makefile

@@ -1,28 +0,0 @@
-include ../config.mak
-
-LIBNAME_COMMON  = libosd.a
-LIBNAME_MPLAYER = libvo.a
-
-SRCS_MPLAYER = aspect.c \
-               geometry.c \
-               old_vo_wrapper.c \
-               spuenc.c \
-               video_out.c \
-               vo_mpegpes.c \
-               vo_null.c \
-               vo_yuv4mpeg.c \
-               $(VO_SRCS) \
-
-SRCS_MPLAYER-$(VIDIX)          +=  vosub_vidix.c
-
-SRCS_COMMON = aclib.c \
-              osd.c \
-              sub.c \
-
-SRCS_COMMON-$(BITMAP_FONT) +=  font_load.c
-SRCS_COMMON-$(FREETYPE)    +=  font_load_ft.c
-
-include ../mpcommon.mak
-
-%.o: %.m
-	$(CC) $(CFLAGS) -c -o $@ $<

loader/Makefile

@@ -1,6 +1,6 @@
 include ../config.mak
 
-LIBNAME_COMMON = libloader.a
+LIBNAME_COMMON = loader.a
 
 #CFLAGS+=-Ddbg_printf=__vprintf -DTRACE=__vprintf -DDETAILED_OUT
 

loader/win32.c

@@ -3666,7 +3666,7 @@ static WIN_BOOL WINAPI expWriteFile(HANDLE h,LPCVOID pv,DWORD size,LPDWORD wr,LP
 static DWORD  WINAPI expSetFilePointer(HANDLE h, LONG val, LPLONG ext, DWORD whence)
 {
     int wh;
-    dbgprintf("SetFilePointer(%d, 0x%x, 0x%x = %d, %d)\n", h, val, ext, *ext, whence);
+    dbgprintf("SetFilePointer(%d, 0x%x, 0x%x = %d, %d)\n", h, val, ext, ext ? *ext : NULL, whence);
     //why would DLL want temporary file with >2Gb size?
     switch(whence)
     {
@@ -4046,6 +4046,16 @@ static int exp_initterm(INITTERMFUNC *start, INITTERMFUNC *end)
 }
 #endif
 
+/* Fake _initterm_e from msvcr80.dll, needed by sirenacm.dll
+ * NOTE: If I make this an alias for _initterm, then sirenacm.dll tries to call
+   other uninmplemented functions; keep this in mind if some future codec needs
+   a real implementation of this function */
+static int exp_initterm_e(INITTERMFUNC *start, INITTERMFUNC *end)
+{
+    dbgprintf("_initterm_e(0x%x, 0x%x)\n", start, end);
+    return 0;
+}
+
 static void* exp__dllonexit()
 {
     // FIXME extract from WINE
@@ -4819,6 +4829,30 @@ static WIN_BOOL WINAPI expEnumDisplaySettingsA(LPCSTR name ,DWORD n,
     return 1;
 }
 
+// Fake implementation of _decode_pointer from msvcr80.dll, needed by sirenacm.dll
+// NOTE: undocumented function, probably the declaration is not right
+static int exp_decode_pointer(void *ptr)
+{
+    dbgprintf("_decode_pointer (0x%08x)\n", ptr);
+    return 0;
+}
+
+/* Fake implementation of sdt::_Lockit::_Lockit(void) from msvcp60.dll
+   Needed by SCLS.DLL */
+static int exp_0Lockit_dummy(void)
+{
+    dbgprintf("0Lockit_dummy (??0_Lockit@std@@QAE@XZ)\n");
+    return 0;
+}
+
+/* Fake implementation of sdt::_Lockit::~_Lockit(void) from msvcp60.dll
+   Needed by SCLS.DLL */
+static int exp_1Lockit_dummy(void)
+{
+    dbgprintf("1Lockit_dummy (??1_Lockit@std@@QAE@XZ)\n");
+    return 0;
+}
+
 struct exports
 {
     char name[64];
@@ -5247,6 +5281,22 @@ struct exports exp_shlwapi[]={
     FF(PathFindFileNameA, -1)
 };
 
+struct exports exp_msvcr80[]={
+    FF(_CIpow,-1)
+    FF(_CIsin,-1)
+    FF(_CIcos,-1)
+    FF(_CIsqrt,-1)
+    FF(memset,-1)
+    FF(_initterm_e, -1)
+    FF(_initterm, -1)
+    FF(_decode_pointer, -1)
+};
+
+struct exports exp_msvcp60[]={
+    {"??0_Lockit@std@@QAE@XZ", -1, exp_0Lockit_dummy},
+    {"??1_Lockit@std@@QAE@XZ", -1, exp_1Lockit_dummy}
+};
+
 #define LL(X) \
     {#X".dll", sizeof(exp_##X)/sizeof(struct exports), exp_##X},
 
@@ -5272,6 +5322,8 @@ struct libs libraries[]={
 #endif
     LL(comdlg32)
     LL(shlwapi)
+    LL(msvcr80)
+    LL(msvcp60)
 };
 
 static WIN_BOOL WINAPI ext_stubs(void)

mp3lib/Makefile

@@ -1,6 +1,6 @@
 include ../config.mak
 
-LIBNAME_COMMON = libmp3.a
+LIBNAME_COMMON = mp3lib.a
 
 SRCS_COMMON = sr1.c
 SRCS_COMMON-$(HAVE_MMX)       += decode_mmx.c

mpcommon.mak

@@ -36,6 +36,9 @@ distclean:: clean
 %.ho: %.h
 	$(CC) $(CFLAGS) -Wno-unused -c -o $@ -x c $<
 
+%.o: %.m
+	$(CC) $(CFLAGS) -c -o $@ $<
+
 ALLHEADERS = $(wildcard *.h)
 checkheaders: $(ALLHEADERS:.h=.ho)
 

tremor/Makefile

@@ -1,22 +0,0 @@
-include ../config.mak
-
-LIBNAME_COMMON = libvorbisidec.a
-
-SRCS_COMMON = bitwise.c \
-              block.c \
-              codebook.c \
-              floor0.c \
-              floor1.c \
-              framing.c \
-              info.c \
-              mapping0.c \
-              mdct.c \
-              registry.c \
-              res012.c \
-              sharedbook.c \
-              synthesis.c \
-              window.c \
-
-CFLAGS-$(TREMOR_LOW)  += -D_LOW_ACCURACY_
-
-include ../mpcommon.mak

vidix/Makefile

@@ -1,6 +1,6 @@
 include ../config.mak
 
-LIBNAME_MPLAYER = libvidix.a
+LIBNAME_MPLAYER = vidix.a
 
 SRCS_MPLAYER    = vidixlib.c \
                   drivers.c \