summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--DOCS/xml/cs/faq.xml2
-rw-r--r--DOCS/xml/de/faq.xml2
-rw-r--r--DOCS/xml/en/faq.xml2
-rw-r--r--DOCS/xml/fr/faq.xml2
-rw-r--r--DOCS/xml/hu/faq.xml2
-rw-r--r--DOCS/xml/it/faq.xml2
-rw-r--r--DOCS/xml/pl/faq.xml2
-rw-r--r--DOCS/xml/ru/faq.xml2
-rwxr-xr-xconfigure13
-rw-r--r--libmpdemux/demux_lavf.c4
-rw-r--r--libmpdemux/muxer_lavf.c2
11 files changed, 16 insertions, 19 deletions
diff --git a/DOCS/xml/cs/faq.xml b/DOCS/xml/cs/faq.xml
index 9e00b9e422..d510a783e5 100644
--- a/DOCS/xml/cs/faq.xml
+++ b/DOCS/xml/cs/faq.xml
@@ -110,7 +110,7 @@ Athlonu?
<answer><para>
Vyzkoušejte následující volby configure:
<screen>
-./configure --target=athlon_xp --cc="gcc -m32" --as="as --32" --with-extralibdir=/usr/lib
+./configure --target=i386-linux --cc="gcc -m32" --as="as --32" --with-extralibdir=/usr/lib
</screen>
</para></answer>
</qandaentry>
diff --git a/DOCS/xml/de/faq.xml b/DOCS/xml/de/faq.xml
index 277fbfab50..ff2140b16c 100644
--- a/DOCS/xml/de/faq.xml
+++ b/DOCS/xml/de/faq.xml
@@ -143,7 +143,7 @@
<answer>
<para>
Probiere folgende configure-Optionen:
- <screen>/configure --target=athlon_xp --cc="gcc -m32" --as="as --32" --with-extralibdir=/usr/lib </screen>
+ <screen>/configure --target=i386-linux --cc="gcc -m32" --as="as --32" --with-extralibdir=/usr/lib </screen>
</para>
</answer>
</qandaentry>
diff --git a/DOCS/xml/en/faq.xml b/DOCS/xml/en/faq.xml
index 026e3739c8..b63255858f 100644
--- a/DOCS/xml/en/faq.xml
+++ b/DOCS/xml/en/faq.xml
@@ -111,7 +111,7 @@ How can I build a 32 bit <application>MPlayer</application> on a 64 bit Athlon?
<answer><para>
Try the following configure options:
<screen>
-./configure --target=athlon_xp --cc="gcc -m32" --as="as --32" --with-extralibdir=/usr/lib
+./configure --target=i386-linux --cc="gcc -m32" --as="as --32" --with-extralibdir=/usr/lib
</screen>
</para></answer>
</qandaentry>
diff --git a/DOCS/xml/fr/faq.xml b/DOCS/xml/fr/faq.xml
index c8b30ae66f..c1eb060bd7 100644
--- a/DOCS/xml/fr/faq.xml
+++ b/DOCS/xml/fr/faq.xml
@@ -104,7 +104,7 @@ Comment puis-je "build" un <application>MPlayer</application> 32 bit sur un Athl
<answer><para>
Essayer les options de configuration suivantes:
<screen>
-./configure --target=athlon_xp --cc="gcc -m32" --as="as --32" --with-extralibdir=/usr/lib
+./configure --target=i386-linux --cc="gcc -m32" --as="as --32" --with-extralibdir=/usr/lib
</screen>
</para></answer>
</qandaentry>
diff --git a/DOCS/xml/hu/faq.xml b/DOCS/xml/hu/faq.xml
index 2274006be1..b998bfbcb8 100644
--- a/DOCS/xml/hu/faq.xml
+++ b/DOCS/xml/hu/faq.xml
@@ -111,7 +111,7 @@ Hogyan fordíthatok 32 bites <application>MPlayer</application>t egy 64 bites At
<answer><para>
Próbáld meg a következő configure kapcsolókkal:
<screen>
-./configure --target=athlon_xp --cc="gcc -m32" --as="as --32" --with-extralibdir=/usr/lib
+./configure --target=i386-linux --cc="gcc -m32" --as="as --32" --with-extralibdir=/usr/lib
</screen>
</para></answer>
</qandaentry>
diff --git a/DOCS/xml/it/faq.xml b/DOCS/xml/it/faq.xml
index 7fd80c0057..6a76142493 100644
--- a/DOCS/xml/it/faq.xml
+++ b/DOCS/xml/it/faq.xml
@@ -111,7 +111,7 @@ Come posso compilare <application>MPlayer</application> a 32 bit su un Athlon a
<answer><para>
Prova le seguenti opzioni di configure:
<screen>
-./configure --target=athlon_xp --cc="gcc -m32" --as="as --32" --with-extralibdir=/usr/lib
+./configure --target=i386-linux --cc="gcc -m32" --as="as --32" --with-extralibdir=/usr/lib
</screen>
</para></answer>
</qandaentry>
diff --git a/DOCS/xml/pl/faq.xml b/DOCS/xml/pl/faq.xml
index 5c33ba1d1e..b6c76a9a07 100644
--- a/DOCS/xml/pl/faq.xml
+++ b/DOCS/xml/pl/faq.xml
@@ -110,7 +110,7 @@ bitowym Athlonie?
<answer><para>
Zastosuj następujące opcje konfiguracyjne.
<screen>
-./configure --target=athlon_xp --cc="gcc -m32" --as="as --32" --with-extralibdir=/usr/lib
+./configure --target=i386-linux --cc="gcc -m32" --as="as --32" --with-extralibdir=/usr/lib
</screen>
</para></answer>
</qandaentry>
diff --git a/DOCS/xml/ru/faq.xml b/DOCS/xml/ru/faq.xml
index fed88e790c..b26ed3bee8 100644
--- a/DOCS/xml/ru/faq.xml
+++ b/DOCS/xml/ru/faq.xml
@@ -108,7 +108,7 @@ while reloading 'asm'</systemitem>.
<answer><para>
Попробуйте следующие опции configure:
<screen>
-./configure --target=athlon_xp --cc="gcc -m32" --as="as --32" --with-extralibdir=/usr/lib
+./configure --target=i386-linux --cc="gcc -m32" --as="as --32" --with-extralibdir=/usr/lib
</screen>
</para></answer>
</qandaentry>
diff --git a/configure b/configure
index debde0dad1..dd14bbef1a 100755
--- a/configure
+++ b/configure
@@ -580,7 +580,7 @@ _speex=auto
_theora=auto
_mp3lib=yes
_liba52=auto
-_liba52_internal=auto
+_liba52_internal=yes
_libdca=auto
_libmpeg2=auto
_faad=auto
@@ -6084,9 +6084,8 @@ echores "$_mp3lib"
echocheck "liba52 support"
_def_liba52='#undef CONFIG_LIBA52'
_def_liba52_internal="#undef CONFIG_LIBA52_INTERNAL"
-if test "$_liba52_internal" = auto ; then
+if test "$_liba52_internal" = yes ; then
_liba52=yes
- _liba52_internal=yes
_def_liba52_internal="#define CONFIG_LIBA52_INTERNAL 1"
_res_comment="internal"
elif test "$_liba52_internal" = no && test "$_liba52" = auto ; then
@@ -6096,9 +6095,7 @@ elif test "$_liba52_internal" = no && test "$_liba52" = auto ; then
#include <a52dec/a52.h>
int main(void) { a52_state_t *testHand; testHand=a52_init(0); return 0; }
EOF
- cc_check -la52 && _liba52=yes
- _ld_extra="$_ld_extra -la52"
- _res_comment="external"
+ cc_check -la52 && _liba52=yes && _res_comment="external" && _ld_extra="$_ld_extra -la52"
fi
if test "$_liba52" = yes ; then
_def_liba52='#define CONFIG_LIBA52 1'
@@ -8061,8 +8058,8 @@ HAVE_XVMC = $_xvmc
DEPEND_CMD = \$(CC) -MM \$(CFLAGS) \$(filter-out %.h,\$^) | sed "s,[0-9a-z._-]*: \(\$(SRC_DIR)/\)*\([a-z0-9]*/\)[^/]* ,\\2&,"
-MPDEPEND_CMD = \$(CC) -MM \$(CFLAGS) \$(filter-out %.h,$^) | sed -e "s,[0-9a-z._-]*: \([a-z0-9/]*/\)[^/]* ,\1&," -e "s,\(.*\)\.o: ,\1.d &,"
-MPDEPEND_CMD_CXX = \$(CC) -MM \$(CXXFLAGS) \$(filter-out %.h,$^) | sed -e "s,[0-9a-z._-]*: \([a-z0-9/]*/\)[^/]* ,\1&," -e "s,\(.*\)\.o: ,\1.d &,"
+MPDEPEND_CMD = \$(CC) -MM \$(CFLAGS) \$(filter-out %.xpm,\$(filter-out %.h,$^)) | sed -e "s,[0-9a-z._-]*: \([a-z0-9/]*/\)[^/]* ,\1&," -e "s,\(.*\)\.o: ,\1.d &,"
+MPDEPEND_CMD_CXX = \$(CC) -MM \$(CXXFLAGS) \$(filter-out %.xpm,\$(filter-out %.h,$^)) | sed -e "s,[0-9a-z._-]*: \([a-z0-9/]*/\)[^/]* ,\1&," -e "s,\(.*\)\.o: ,\1.d &,"
EOF
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c
index 641b7cf902..0e33e38d1c 100644
--- a/libmpdemux/demux_lavf.c
+++ b/libmpdemux/demux_lavf.c
@@ -92,9 +92,9 @@ static int mp_read(void *opaque, uint8_t *buf, int size) {
return ret;
}
-static offset_t mp_seek(void *opaque, offset_t pos, int whence) {
+static int64_t mp_seek(void *opaque, int64_t pos, int whence) {
stream_t *stream = opaque;
- offset_t current_pos;
+ int64_t current_pos;
mp_msg(MSGT_HEADER,MSGL_DBG2,"mp_seek(%p, %d, %d)\n", stream, (int)pos, whence);
if(whence == SEEK_CUR)
pos +=stream_tell(stream);
diff --git a/libmpdemux/muxer_lavf.c b/libmpdemux/muxer_lavf.c
index fe7f5715fc..3cb536476b 100644
--- a/libmpdemux/muxer_lavf.c
+++ b/libmpdemux/muxer_lavf.c
@@ -73,7 +73,7 @@ static int mp_write(void *opaque, uint8_t *buf, int size)
return stream_write_buffer(muxer->stream, buf, size);
}
-static offset_t mp_seek(void *opaque, offset_t pos, int whence)
+static int64_t mp_seek(void *opaque, int64_t pos, int whence)
{
muxer_t *muxer = opaque;
if(whence == SEEK_CUR)
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-11 04:43:40 +0000