From c8b5921d065283977f31dc5097775a011bfcfcaf Mon Sep 17 00:00:00 2001 From: reimar Date: Wed, 7 May 2008 22:46:50 +0000 Subject: Avoid dependency on newer pulseaudio version. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26681 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libao2/ao_pulse.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libao2/ao_pulse.c b/libao2/ao_pulse.c index 5140a5e5c5..4fbd0fc5c4 100644 --- a/libao2/ao_pulse.c +++ b/libao2/ao_pulse.c @@ -116,10 +116,14 @@ static const struct format_map_s { } format_maps[] = { {AF_FORMAT_S16_LE, PA_SAMPLE_S16LE}, {AF_FORMAT_S16_BE, PA_SAMPLE_S16BE}, +#ifdef PA_SAMPLE_S32NE {AF_FORMAT_S32_LE, PA_SAMPLE_S32LE}, {AF_FORMAT_S32_BE, PA_SAMPLE_S32BE}, +#endif +#ifdef PA_SAMPLE_FLOAT32NE {AF_FORMAT_FLOAT_LE, PA_SAMPLE_FLOAT32LE}, {AF_FORMAT_FLOAT_BE, PA_SAMPLE_FLOAT32BE}, +#endif {AF_FORMAT_U8, PA_SAMPLE_U8}, {AF_FORMAT_MU_LAW, PA_SAMPLE_ULAW}, {AF_FORMAT_A_LAW, PA_SAMPLE_ALAW}, -- cgit v1.2.3 From 5fb33b5b5f3d7d8ce8a13707e97b3240860ece9b Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 7 May 2008 23:26:16 +0000 Subject: 1l: Remove leftover _lavc_x264 variable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26682 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 301afead6a..6a233321f5 100755 --- a/configure +++ b/configure @@ -6587,7 +6587,7 @@ else _def_lavc_x264='#undef CONFIG_LIBX264' _nocodecmodules="x264 $_nocodecmodules" fi -echores "$_x264 (in libavcodec: $_lavc_x264)" +echores "$_x264" echocheck "libnut" -- cgit v1.2.3 From 410f101d4d1e1c0f9449c58e290c0321a9d8f000 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 7 May 2008 23:45:11 +0000 Subject: Remove obscure comment about libmp3lame depending on Vorbis. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26683 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 1 - 1 file changed, 1 deletion(-) diff --git a/configure b/configure index 6a233321f5..0adbb6f58e 100755 --- a/configure +++ b/configure @@ -6651,7 +6651,6 @@ int main(void) { lame_version_t lv; (void) lame_init(); get_lame_version_numerical(&lv); printf("%d%d\n",lv.major,lv.minor); return 0; } EOF -# Note: libmp3lame usually depends on vorbis cc_check -lmp3lame $_ld_lm && tmp_run && _mp3lame=yes if test "$_mp3lame" = yes ; then _def_mp3lame="#define HAVE_MP3LAME" -- cgit v1.2.3 From 95bb2b83b957f96ea0025262339c7d304bf68d77 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 7 May 2008 23:55:03 +0000 Subject: more complete mphelp_check.py command lines, typo, clarifications git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26684 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/tech/translations.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/DOCS/tech/translations.txt b/DOCS/tech/translations.txt index 60555852ac..ba2b084572 100644 --- a/DOCS/tech/translations.txt +++ b/DOCS/tech/translations.txt @@ -28,7 +28,7 @@ translating. Furthermore, if you take over an unmaintained translation, bring the existing parts up-to-date before translating new ones. Outdated information is worse -than missing information. For console messages and the XML documentation +than missing information. For console messages and the XML documentation, missing parts are automatically replaced by the English versions. Translations of MPlayer documentation consist of 3 parts in descending @@ -55,11 +55,12 @@ TOOLS/mphelp_check.py is a small tool to check translated files. It will report conflicting arguments, strings not present in the master file and (optionally) strings missing from the translation. Running it as - mphelp_check.py help_mp-en.h help_mp-XX.h + TOOLS/mphelp_check.py help/help_mp-en.h help/help_mp-XX.h will output errors to the screen, just substitute XX with your language code. +Adding the -missing option to the command line as in - mphelp_check.py -missing help_mp-en.h help_mp-XX.h + TOOLS/mphelp_check.py -missing help/help_mp-en.h help/help_mp-XX.h will additionally print untranslated messages to the screen. @@ -101,4 +102,4 @@ adapting parts that changed in the English master file, leave the sync tag as it is. If you make changes to the XML documentation, doublecheck that the -documentation still builds by running make. +documentation still builds by running 'make' in the DOCS/xml/ subdirectory. -- cgit v1.2.3 From 2bfced63f58a068e0d0d073f7dd300252bb38b3c Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 7 May 2008 23:58:59 +0000 Subject: small wording fix git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26685 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/tech/translations.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DOCS/tech/translations.txt b/DOCS/tech/translations.txt index ba2b084572..6d87f6cb34 100644 --- a/DOCS/tech/translations.txt +++ b/DOCS/tech/translations.txt @@ -91,7 +91,7 @@ incomplete, please let us know, we'll fix it. Patches are more than welcome, of course. Do not, however, change the translation first, please get your update into the English version first. -If you have Subversion write access and commit a translation update file, +If you have Subversion write access and commit a translation update, use something like "synced with rXXX" as first line of the commit message so that it is possible to tell with a glance at the Subversion log or ViewVC if the translation is outdated and which revision of the English master file -- cgit v1.2.3 From 20d3bb5709a338b49cb917ab5a961c83c9996dcf Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 8 May 2008 00:00:57 +0000 Subject: Add paragraph headings. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26686 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/tech/translations.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/DOCS/tech/translations.txt b/DOCS/tech/translations.txt index 6d87f6cb34..3e5126682f 100644 --- a/DOCS/tech/translations.txt +++ b/DOCS/tech/translations.txt @@ -40,6 +40,10 @@ order of importance: Please note that only doing 1) or 1) + 2) is perfectly fine. + +console messages: +~~~~~~~~~~~~~~~~~ + You can find the latest versions of the help_mp-XX.h files in Subversion or here: @@ -80,6 +84,10 @@ to the file header, replacing XXX with the revision of help_mp-en.h that your translation is in sync with. This way we can easily tell if the translation is up to date or not. + +general: +~~~~~~~~ + Please note that the help_mp files and the XML documentation are both encoded in UTF-8. Editing these files in a program which uses a different encoding will result in breaking console messages and HTML. @@ -101,5 +109,9 @@ If you make (spelling/wording/consistency/etc) changes to a file without adapting parts that changed in the English master file, leave the sync tag as it is. + +XML documentation: +~~~~~~~~~~~~~~~~~~ + If you make changes to the XML documentation, doublecheck that the documentation still builds by running 'make' in the DOCS/xml/ subdirectory. -- cgit v1.2.3 From 549dc41033bb29a516cf953b2eddbab63ea0b787 Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 8 May 2008 00:04:27 +0000 Subject: Move some blocks around for better text structuring. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26687 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/tech/translations.txt | 70 +++++++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/DOCS/tech/translations.txt b/DOCS/tech/translations.txt index 3e5126682f..9783555556 100644 --- a/DOCS/tech/translations.txt +++ b/DOCS/tech/translations.txt @@ -8,6 +8,16 @@ in order to be useful. Otherwise they quickly get outdated and become obsolete, useless cruft. That said, we would be happy if you could maintain a new documentation translation. +Experience shows that translations work best when done by teams. Not only +can the workload be shared, but there is also the chance to review the +translation. So if possible try to find more people to help out with +translating. + +Furthermore, if you take over an unmaintained translation, bring the existing +parts up-to-date before translating new ones. Outdated information is worse +than missing information. For console messages and the XML documentation, +missing parts are automatically replaced by the English versions. + Documentation related discussions happen on the MPlayer-DOCS mailing list, while documentation translation related discussions happen on the MPlayer-translations mailing list. If you want to maintain a translation @@ -21,16 +31,6 @@ http://lists.mplayerhq.hu/mailman/listinfo/mplayer-translations Send updates and patches to this mailing list or directly to the translation coordination maintainer, see DOCS/tech/MAINTAINERS for details. -Experience shows that translations work best when done by teams. Not only -can the workload be shared, but there is also the chance to review the -translation. So if possible try to find more people to help out with -translating. - -Furthermore, if you take over an unmaintained translation, bring the existing -parts up-to-date before translating new ones. Outdated information is worse -than missing information. For console messages and the XML documentation, -missing parts are automatically replaced by the English versions. - Translations of MPlayer documentation consist of 3 parts in descending order of importance: @@ -41,6 +41,31 @@ order of importance: Please note that only doing 1) or 1) + 2) is perfectly fine. +general: +~~~~~~~~ + +Please note that the help_mp files and the XML documentation are both encoded +in UTF-8. Editing these files in a program which uses a different encoding +will result in breaking console messages and HTML. + +Translations are for documentation what porting is for code. Many more eyes +see it and get to find mistakes. If you stumble over mistakes, inaccuracies, +clumsy wording, spelling/grammar errors or if you notice that something is +incomplete, please let us know, we'll fix it. Patches are more than welcome, +of course. Do not, however, change the translation first, please get your +update into the English version first. + +If you have Subversion write access and commit a translation update, use +something like "synced with rXXX" as first line of the commit message so +that it is possible to tell with a glance at the Subversion log or ViewVC +if the translation is outdated and which revision of the English master +file it is equivalent to. + +If you make (spelling/wording/consistency/etc) changes to a file without +adapting parts that changed in the English master file, leave the sync +tag as it is. + + console messages: ~~~~~~~~~~~~~~~~~ @@ -85,31 +110,6 @@ translation is in sync with. This way we can easily tell if the translation is up to date or not. -general: -~~~~~~~~ - -Please note that the help_mp files and the XML documentation are both encoded -in UTF-8. Editing these files in a program which uses a different encoding -will result in breaking console messages and HTML. - -Translations are for documentation what porting is for code. Many more eyes -see it and get to find mistakes. If you stumble over mistakes, inaccuracies, -clumsy wording, spelling/grammar errors or if you notice that something is -incomplete, please let us know, we'll fix it. Patches are more than welcome, -of course. Do not, however, change the translation first, please get your -update into the English version first. - -If you have Subversion write access and commit a translation update, -use something like "synced with rXXX" as first line of the commit message -so that it is possible to tell with a glance at the Subversion log or ViewVC -if the translation is outdated and which revision of the English master file -it is equivalent to. - -If you make (spelling/wording/consistency/etc) changes to a file without -adapting parts that changed in the English master file, leave the sync -tag as it is. - - XML documentation: ~~~~~~~~~~~~~~~~~~ -- cgit v1.2.3 From c792add91f6d9bb5834c33298914453663d5267c Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 8 May 2008 00:10:35 +0000 Subject: Clarify order of importance for translations. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26688 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/tech/translations.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/DOCS/tech/translations.txt b/DOCS/tech/translations.txt index 9783555556..abee3c9e77 100644 --- a/DOCS/tech/translations.txt +++ b/DOCS/tech/translations.txt @@ -38,8 +38,12 @@ order of importance: 2) man page 3) XML documentation -Please note that only doing 1) or 1) + 2) is perfectly fine. +Not all parts are available in all languages. Keeping existing parts up-to-date +should have precedence over adding newly translated content. It is perfectly +acceptable to work on only a subset of these parts, but please follow the above +order of importance nonetheless. +Now on to some more detailed instructions... general: ~~~~~~~~ -- cgit v1.2.3 From 071f30cee82a21250a4400a03a04280e85bad8e8 Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 8 May 2008 00:14:18 +0000 Subject: Add paragraph about homepage translation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26689 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/tech/translations.txt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/DOCS/tech/translations.txt b/DOCS/tech/translations.txt index abee3c9e77..df8ac4321d 100644 --- a/DOCS/tech/translations.txt +++ b/DOCS/tech/translations.txt @@ -34,6 +34,7 @@ coordination maintainer, see DOCS/tech/MAINTAINERS for details. Translations of MPlayer documentation consist of 3 parts in descending order of importance: +0) homepage 1) console messages (help/help_mp-XX.h) 2) man page 3) XML documentation @@ -70,6 +71,22 @@ adapting parts that changed in the English master file, leave the sync tag as it is. +homepage: +~~~~~~~~~ + +Get the homepage from Subversion with + + svn checkout svn://svn.mplayerhq.hu/homepage/trunk/ homepage + +or browse the sources online at + +http://svn.mplayerhq.hu/homepage/trunk/ + +The homepage uses design template files that are combined with the content +files to form the final HTML pages. To build the HTML pages, type 'make' in +the root of the homepage source directory. + + console messages: ~~~~~~~~~~~~~~~~~ -- cgit v1.2.3 From 4805407960b70c454cf4e33125788101fef8d940 Mon Sep 17 00:00:00 2001 From: eugeni Date: Thu, 8 May 2008 13:53:56 +0000 Subject: Remove extra family names from the search pattern after FcFontSort and call FcFontRenderPrepare to select the best family name for the font in case there are several of them. This does not affect font matching results, but helps to avoid warning about inexact match. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26690 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libass/ass_fontconfig.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/libass/ass_fontconfig.c b/libass/ass_fontconfig.c index b98b67555f..2ae22dab55 100644 --- a/libass/ass_fontconfig.c +++ b/libass/ass_fontconfig.c @@ -73,6 +73,7 @@ static char* _select_font(fc_instance_t* priv, const char* family, unsigned bold FcFontSet* fset = 0; int curf; char* retval = 0; + int family_cnt; *index = 0; @@ -93,11 +94,13 @@ static char* _select_font(fc_instance_t* priv, const char* family, unsigned bold // precedence in matching. // An alternative approach could be to reimplement FcFontSort // using FC_FULLNAME instead of FC_FAMILY. + family_cnt = 1; if (strchr(family, ' ')) { char *p, *s = strdup(family); while (p = strrchr(s, ' ')) { *p = '\0'; FcPatternAddString(pat, FC_FAMILY, (const FcChar8*)s); + ++ family_cnt; } free(s); } @@ -114,16 +117,16 @@ static char* _select_font(fc_instance_t* priv, const char* family, unsigned bold fset = FcFontSort(priv->config, pat, FcTrue, NULL, &result); for (curf = 0; curf < fset->nfont; ++curf) { - rpat = fset->fonts[curf]; - - result = FcPatternGetBool(rpat, FC_OUTLINE, 0, &r_outline); + FcPattern* curp = fset->fonts[curf]; + + result = FcPatternGetBool(curp, FC_OUTLINE, 0, &r_outline); if (result != FcResultMatch) continue; if (r_outline != FcTrue) continue; if (!code) break; - result = FcPatternGetCharSet(rpat, FC_CHARSET, 0, &r_charset); + result = FcPatternGetCharSet(curp, FC_CHARSET, 0, &r_charset); if (result != FcResultMatch) continue; if (FcCharSetHasChar(r_charset, code)) @@ -133,8 +136,16 @@ static char* _select_font(fc_instance_t* priv, const char* family, unsigned bold if (curf >= fset->nfont) goto error; - rpat = fset->fonts[curf]; - + // Remove all extra family names from original pattern. + // After this, FcFontRenderPrepare will select the most relevant family + // name in case there are more than one of them. + for (; family_cnt > 1; --family_cnt) + FcPatternRemove(pat, FC_FAMILY, family_cnt - 1); + + rpat = FcFontRenderPrepare(priv->config, pat, fset->fonts[curf]); + if (!rpat) + goto error; + result = FcPatternGetInteger(rpat, FC_INDEX, 0, &r_index); if (result != FcResultMatch) goto error; @@ -181,6 +192,7 @@ static char* _select_font(fc_instance_t* priv, const char* family, unsigned bold error: if (pat) FcPatternDestroy(pat); + if (rpat) FcPatternDestroy(rpat); if (fset) FcFontSetDestroy(fset); return retval; } -- cgit v1.2.3 From 263c691380a279de2da296591c6a15a6a2ef1e67 Mon Sep 17 00:00:00 2001 From: eugeni Date: Thu, 8 May 2008 13:53:58 +0000 Subject: If both full name and family are available, use the former in inexact match warning. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26691 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libass/ass_fontconfig.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libass/ass_fontconfig.c b/libass/ass_fontconfig.c index 2ae22dab55..22f89b9cb3 100644 --- a/libass/ass_fontconfig.c +++ b/libass/ass_fontconfig.c @@ -167,7 +167,7 @@ static char* _select_font(fc_instance_t* priv, const char* family, unsigned bold if (!(r_family && strcasecmp((const char*)r_family, family) == 0) && !(r_fullname && strcasecmp((const char*)r_fullname, family) == 0)) mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_SelectedFontFamilyIsNotTheRequestedOne, - (const char*)(r_family ? r_family : r_fullname), family); + (const char*)(r_fullname ? r_fullname : r_family), family); result = FcPatternGetString(rpat, FC_STYLE, 0, &r_style); if (result != FcResultMatch) -- cgit v1.2.3 From 2c9139be84806bfaec826914427d3756a8fd2fe3 Mon Sep 17 00:00:00 2001 From: eugeni Date: Thu, 8 May 2008 13:54:00 +0000 Subject: Define FC_FULLNAME and FC_EMBOLDEN to fix compilation with ancient fontconfig. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26692 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libass/ass_fontconfig.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libass/ass_fontconfig.c b/libass/ass_fontconfig.c index 22f89b9cb3..289318ba75 100644 --- a/libass/ass_fontconfig.c +++ b/libass/ass_fontconfig.c @@ -50,6 +50,16 @@ struct fc_instance_s { }; #ifdef HAVE_FONTCONFIG + +// 4yo fontconfig does not have these. +// They are only needed for debug output, anyway. +#ifndef FC_FULLNAME +#define FC_FULLNAME "fullname" +#endif +#ifndef FC_EMBOLDEN +#define FC_EMBOLDEN "embolden" +#endif + /** * \brief Low-level font selection. * \param priv private data -- cgit v1.2.3 From 30f7fb8c69857f09f995542a840fc25362c95547 Mon Sep 17 00:00:00 2001 From: ulion Date: Thu, 8 May 2008 15:55:21 +0000 Subject: Distinguish between ac3 and dts by format tag. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26693 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/ad_hwac3.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libmpcodecs/ad_hwac3.c b/libmpcodecs/ad_hwac3.c index 34850f2a6a..2ddbc0f450 100644 --- a/libmpcodecs/ad_hwac3.c +++ b/libmpcodecs/ad_hwac3.c @@ -61,6 +61,8 @@ static int ac3dts_fillbuff(sh_audio_t *sh_audio) sh_audio->a_in_buffer[sh_audio->a_in_buffer_len++] = c; } + if (sh_audio->format == 0x2001) + { length = dts_syncinfo(sh_audio->a_in_buffer, &flags, &sample_rate, &bit_rate); if(length >= 12) { @@ -71,6 +73,9 @@ static int ac3dts_fillbuff(sh_audio_t *sh_audio) } break; } + } + else + { length = a52_syncinfo(sh_audio->a_in_buffer, &flags, &sample_rate, &bit_rate); if(length >= 7 && length <= 3840) { @@ -81,6 +86,7 @@ static int ac3dts_fillbuff(sh_audio_t *sh_audio) } break; /* we're done.*/ } + } /* bad file => resync*/ memcpy(sh_audio->a_in_buffer, sh_audio->a_in_buffer + 1, 11); --sh_audio->a_in_buffer_len; -- cgit v1.2.3 From d915b7fc976dd49e42bb26a56027cb2a245d25f5 Mon Sep 17 00:00:00 2001 From: ulion Date: Thu, 8 May 2008 16:05:49 +0000 Subject: Reindent for last commit. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26694 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/ad_hwac3.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/libmpcodecs/ad_hwac3.c b/libmpcodecs/ad_hwac3.c index 2ddbc0f450..1ac2a5155e 100644 --- a/libmpcodecs/ad_hwac3.c +++ b/libmpcodecs/ad_hwac3.c @@ -63,29 +63,29 @@ static int ac3dts_fillbuff(sh_audio_t *sh_audio) if (sh_audio->format == 0x2001) { - length = dts_syncinfo(sh_audio->a_in_buffer, &flags, &sample_rate, &bit_rate); - if(length >= 12) - { - if(isdts != 1) + length = dts_syncinfo(sh_audio->a_in_buffer, &flags, &sample_rate, &bit_rate); + if(length >= 12) { - mp_msg(MSGT_DECAUDIO, MSGL_STATUS, "hwac3: switched to DTS, %d bps, %d Hz\n", bit_rate, sample_rate); - isdts = 1; + if(isdts != 1) + { + mp_msg(MSGT_DECAUDIO, MSGL_STATUS, "hwac3: switched to DTS, %d bps, %d Hz\n", bit_rate, sample_rate); + isdts = 1; + } + break; } - break; - } } else { - length = a52_syncinfo(sh_audio->a_in_buffer, &flags, &sample_rate, &bit_rate); - if(length >= 7 && length <= 3840) - { - if(isdts != 0) + length = a52_syncinfo(sh_audio->a_in_buffer, &flags, &sample_rate, &bit_rate); + if(length >= 7 && length <= 3840) { - mp_msg(MSGT_DECAUDIO, MSGL_STATUS, "hwac3: switched to AC3, %d bps, %d Hz\n", bit_rate, sample_rate); - isdts = 0; + if(isdts != 0) + { + mp_msg(MSGT_DECAUDIO, MSGL_STATUS, "hwac3: switched to AC3, %d bps, %d Hz\n", bit_rate, sample_rate); + isdts = 0; + } + break; /* we're done.*/ } - break; /* we're done.*/ - } } /* bad file => resync*/ memcpy(sh_audio->a_in_buffer, sh_audio->a_in_buffer + 1, 11); -- cgit v1.2.3 From 80dc6cf37b288ecc5e95ca4a910c69aad55ae9ee Mon Sep 17 00:00:00 2001 From: compn Date: Thu, 8 May 2008 16:23:07 +0000 Subject: add h264 speedups git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26695 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog b/Changelog index 3e50f7db97..926ef10195 100644 --- a/Changelog +++ b/Changelog @@ -28,7 +28,7 @@ MPlayer (1.0) FFmpeg/libavcodec: * DNxHD (SMPTE VC-3) encoder - * H.264 PAFF decoding + * H.264 speedup and PAFF decoding * Nellymoser audio codec * VC-1/WMV3 MMX optimizations -- cgit v1.2.3 From ed5f632ca1da5e90981d8b44068a622f797e8ef6 Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 8 May 2008 21:22:13 +0000 Subject: Remove useless output. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26696 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index 9dc7d52cde..6bf6955f4d 100644 --- a/Makefile +++ b/Makefile @@ -736,7 +736,6 @@ endif @echo '#endif /* MPLAYER_HELP_MP_H */' >> help_mp.h ifneq ($(HELP_FILE),help/help_mp-en.h) - @echo "Adding untranslated messages to help_mp.h" @echo '// untranslated messages from the English master file:' >> help_mp.h @help/help_diff.sh $(HELP_FILE) < help/help_mp-en.h >> help_mp.h endif -- cgit v1.2.3 From e5b39178e83b5cabc4da612a92bc270788630d72 Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 8 May 2008 21:50:31 +0000 Subject: cosmetics: Rename _def_lavc_* variables to _def_*_lavc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26697 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/configure b/configure index 0adbb6f58e..2f377d3cdd 100755 --- a/configure +++ b/configure @@ -6026,11 +6026,11 @@ if test "$_faac" = yes ; then _def_faac="#define HAVE_FAAC 1" if echo $_libavencoders | grep -q FAAC ; then _lavc_faac=yes - _def_lavc_faac="#define CONFIG_LIBFAAC 1" + _def_faac_lavc="#define CONFIG_LIBFAAC 1" _libs_mplayer="$_libs_mplayer $_ld_faac" else _lavc_faac=no - _def_lavc_faac="#undef CONFIG_LIBFAAC" + _def_faac_lavc="#undef CONFIG_LIBFAAC" fi _codecmodules="faac $_codecmodules" else @@ -6550,11 +6550,11 @@ int main(void) { xvid_plugin_2pass2_t s; s.vbv_size=0; return 0; } EOF if cc_check ; then _lavc_xvid=yes - _def_lavc_xvid='#define CONFIG_LIBXVID 1' + _def_xvid_lavc='#define CONFIG_LIBXVID 1' _libavencoders="$_libavencoders LIBXVID_ENCODER" else _lavc_xvid=no - _def_lavc_xvid='#undef CONFIG_LIBXVID' + _def_xvid_lavc='#undef CONFIG_LIBXVID' fi echores "$_lavc_xvid" fi @@ -6579,12 +6579,12 @@ fi if test "$_x264" = yes ; then _def_x264='#define HAVE_X264 1' _codecmodules="x264 $_codecmodules" - _def_lavc_x264='#define CONFIG_LIBX264 1' + _def_x264_lavc='#define CONFIG_LIBX264 1' _libs_mplayer="$_libs_mplayer $_ld_x264" _libavencoders="$_libavencoders LIBX264_ENCODER" else _def_x264='#undef HAVE_X264' - _def_lavc_x264='#undef CONFIG_LIBX264' + _def_x264_lavc='#undef CONFIG_LIBX264' _nocodecmodules="x264 $_nocodecmodules" fi echores "$_x264" @@ -6668,12 +6668,12 @@ EOF cc_check $_ld_mp3lame $_ld_lm && _def_mp3lame_preset_medium="#define HAVE_MP3LAME_PRESET_MEDIUM" if echo $_libavencoders | grep -q MP3LAME ; then _lavc_mp3lame=yes - _def_lavc_mp3lame="#define CONFIG_LIBMP3LAME 1" + _def_mp3lame_lavc="#define CONFIG_LIBMP3LAME 1" _libavencoders="$_libavencoders LIBMP3LAME_ENCODER" _libs_mplayer="$_libs_mplayer $_ld_mp3lame" else _lavc_mp3lame=no - _def_lavc_mp3lame="#undef CONFIG_LIBMP3LAME" + _def_mp3lame_lavc="#undef CONFIG_LIBMP3LAME" fi else _def_mp3lame='#undef HAVE_MP3LAME' @@ -8150,10 +8150,10 @@ $_def_libamr_wb `ff_config_enable "$_libavprotocols_all" "$_libavprotocols"` `ff_config_enable "$_libavbsfs_all" "$_libavbsfs"` -$_def_lavc_faac -$_def_lavc_xvid -$_def_lavc_mp3lame -$_def_lavc_x264 +$_def_faac_lavc +$_def_mp3lame_lavc +$_def_x264_lavc +$_def_xvid_lavc /* Use codec libs included in mplayer CVS / source dist: */ $_def_mp3lib -- cgit v1.2.3 From e68334018fddc73870af29181c20d2ff5227231d Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 8 May 2008 21:58:32 +0000 Subject: cosmetics: Rename _lavc_* variables to _*_lavc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26698 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/configure b/configure index 2f377d3cdd..5477ac9ae9 100755 --- a/configure +++ b/configure @@ -6025,11 +6025,11 @@ fi if test "$_faac" = yes ; then _def_faac="#define HAVE_FAAC 1" if echo $_libavencoders | grep -q FAAC ; then - _lavc_faac=yes + _faac_lavc=yes _def_faac_lavc="#define CONFIG_LIBFAAC 1" _libs_mplayer="$_libs_mplayer $_ld_faac" else - _lavc_faac=no + _faac_lavc=no _def_faac_lavc="#undef CONFIG_LIBFAAC" fi _codecmodules="faac $_codecmodules" @@ -6037,7 +6037,7 @@ else _def_faac="#undef HAVE_FAAC" _nocodecmodules="faac $_nocodecmodules" fi -echores "$_faac (in libavcodec: $_lavc_faac)" +echores "$_faac (in libavcodec: $_faac_lavc)" echocheck "FAAD2 (AAC) support" @@ -6549,14 +6549,14 @@ if test "$_xvid" = yes ; then int main(void) { xvid_plugin_2pass2_t s; s.vbv_size=0; return 0; } EOF if cc_check ; then - _lavc_xvid=yes + _xvid_lavc=yes _def_xvid_lavc='#define CONFIG_LIBXVID 1' _libavencoders="$_libavencoders LIBXVID_ENCODER" else - _lavc_xvid=no + _xvid_lavc=no _def_xvid_lavc='#undef CONFIG_LIBXVID' fi - echores "$_lavc_xvid" + echores "$_xvid_lavc" fi @@ -6667,12 +6667,12 @@ int main(void) { lame_set_preset(NULL, MEDIUM_FAST); return 0; } EOF cc_check $_ld_mp3lame $_ld_lm && _def_mp3lame_preset_medium="#define HAVE_MP3LAME_PRESET_MEDIUM" if echo $_libavencoders | grep -q MP3LAME ; then - _lavc_mp3lame=yes + _mp3lame_lavc=yes _def_mp3lame_lavc="#define CONFIG_LIBMP3LAME 1" _libavencoders="$_libavencoders LIBMP3LAME_ENCODER" _libs_mplayer="$_libs_mplayer $_ld_mp3lame" else - _lavc_mp3lame=no + _mp3lame_lavc=no _def_mp3lame_lavc="#undef CONFIG_LIBMP3LAME" fi else @@ -7757,11 +7757,11 @@ CONFIG_MUXERS=$_mencoder CONFIG_LIBAMR=$_libamr CONFIG_LIBAMR_NB=$_libamr_nb CONFIG_LIBAMR_WB=$_libamr_wb -CONFIG_LIBFAAC=$_lavc_faac -CONFIG_LIBMP3LAME=$_lavc_mp3lame +CONFIG_LIBFAAC=$_faac_lavc +CONFIG_LIBMP3LAME=$_mp3lame_lavc CONFIG_LIBVORBIS=$_libvorbis CONFIG_LIBX264=$_x264 -CONFIG_LIBXVID=$_lavc_xvid +CONFIG_LIBXVID=$_xvid_lavc CONFIG_MLIB = $_mlib # Prevent building libavcodec/imgresample.c with conflicting symbols CONFIG_SWSCALE=yes -- cgit v1.2.3 From becb41b03ebe306c3f820b2756befd2986278a0f Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 8 May 2008 22:32:40 +0000 Subject: Add option to disable mp3lame. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26699 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 5477ac9ae9..0eb46cdcd9 100755 --- a/configure +++ b/configure @@ -311,6 +311,7 @@ Codecs: --disable-ladspa disable LADSPA plugin support [autodetect] --disable-libdv disable libdv 0.9.5 en/decoding support [autodetect] --disable-mad disable libmad (MPEG audio) support [autodetect] + --disable-mp3lame disable LAME MP3 encoding support [autodetect] --disable-toolame disable Toolame (MPEG layer 2) encoding [autodetect] --disable-twolame disable Twolame (MPEG layer 2) encoding [autodetect] --enable-xmms enable XMMS input plugin support [disabled] @@ -553,6 +554,7 @@ _openal=auto _libcdio=auto _liblzo=auto _mad=auto +_mp3lame=auto _toolame=auto _twolame=auto _tremor_internal=yes @@ -890,6 +892,8 @@ for ac_option do --disable-openal) _openal=no ;; --enable-mad) _mad=yes ;; --disable-mad) _mad=no ;; + --enable-mp3lame) _mp3lame=yes ;; + --disable-mp3lame) _mp3lame=no ;; --enable-toolame) _toolame=yes ;; --disable-toolame) _toolame=no ;; --enable-twolame) _twolame=yes ;; @@ -6642,9 +6646,10 @@ echores "$_zr" if test "$_mencoder" != no ; then echocheck "libmp3lame (for mencoder)" -_mp3lame=no _def_mp3lame_preset='#undef HAVE_MP3LAME_PRESET' _def_mp3lame_preset_medium='#undef HAVE_MP3LAME_PRESET_MEDIUM' +if test "$_mp3lame" = auto ; then +_mp3lame=no cat > $TMPC < int main(void) { lame_version_t lv; (void) lame_init(); @@ -6652,6 +6657,7 @@ int main(void) { lame_version_t lv; (void) lame_init(); return 0; } EOF cc_check -lmp3lame $_ld_lm && tmp_run && _mp3lame=yes +fi if test "$_mp3lame" = yes ; then _def_mp3lame="#define HAVE_MP3LAME" _ld_mp3lame=-lmp3lame -- cgit v1.2.3 From 1b9fab9b177a5c3e9771f355bee664f802db563d Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 8 May 2008 22:50:17 +0000 Subject: Add options to handle the external libraries in libavcodec, which require extra linker flags etc. individually. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26700 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 56 +++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 39 insertions(+), 17 deletions(-) diff --git a/configure b/configure index 0eb46cdcd9..5e115d2fea 100755 --- a/configure +++ b/configure @@ -286,7 +286,9 @@ Codecs: --disable-xanim disable XAnim codecs support [enabled] --disable-real disable RealPlayer codecs support [enabled] --disable-xvid disable XviD [autodetect] + --disable-xvid-lavc disable XviD in libavcodec [autodetect] --disable-x264 disable x264 [autodetect] + --disable-x264-lavc disable x264 in libavcodec [autodetect] --disable-libnut disable libnut [autodetect] --disable-libavutil_a disable static libavutil [autodetect] --disable-libavcodec_a disable static libavcodec [autodetect] @@ -308,10 +310,12 @@ Codecs: --disable-faad-internal disable internal FAAD2 (AAC) [autodetect] --enable-faad-fixed enable fixed-point mode in internal FAAD2 [disabled] --disable-faac disable support for FAAC (AAC encoder) [autodetect] + --disable-faac-lavc disable support for FAAC in libavcodec [autodetect] --disable-ladspa disable LADSPA plugin support [autodetect] --disable-libdv disable libdv 0.9.5 en/decoding support [autodetect] --disable-mad disable libmad (MPEG audio) support [autodetect] --disable-mp3lame disable LAME MP3 encoding support [autodetect] + --disable-mp3lame-lavc disable LAME in libavcodec [autodetect] --disable-toolame disable Toolame (MPEG layer 2) encoding [autodetect] --disable-twolame disable Twolame (MPEG layer 2) encoding [autodetect] --enable-xmms enable XMMS input plugin support [disabled] @@ -555,6 +559,7 @@ _libcdio=auto _liblzo=auto _mad=auto _mp3lame=auto +_mp3lame_lavc=auto _toolame=auto _twolame=auto _tremor_internal=yes @@ -571,6 +576,7 @@ _faad_internal=auto _faad_external=auto _faad_fixed=no _faac=auto +_faac_lavc=auto _ladspa=auto _xmms=no _dvdnav=auto @@ -617,7 +623,9 @@ _vidix_external=auto _vidix_pcidb=yes _joystick=no _xvid=auto +_xvid_lavc=auto _x264=auto +_x264_lavc=auto _libnut=auto _lirc=auto _lircc=auto @@ -894,6 +902,8 @@ for ac_option do --disable-mad) _mad=no ;; --enable-mp3lame) _mp3lame=yes ;; --disable-mp3lame) _mp3lame=no ;; + --enable-mp3lame-lavc) _mp3lame_lavc=yes ;; + --disable-mp3lame-lavc) _mp3lame_lavc=no ;; --enable-toolame) _toolame=yes ;; --disable-toolame) _toolame=no ;; --enable-twolame) _twolame=yes ;; @@ -932,6 +942,8 @@ for ac_option do --disable-faad-fixed) _faad_fixed=no ;; --enable-faac) _faac=yes ;; --disable-faac) _faac=no ;; + --enable-faac-lavc) _faac_lavc=yes ;; + --disable-faac-lavc) _faac_lavc=no ;; --enable-ladspa) _ladspa=yes ;; --disable-ladspa) _ladspa=no ;; --enable-xmms) _xmms=yes ;; @@ -1014,8 +1026,12 @@ for ac_option do --disable-joystick) _joystick=no ;; --enable-xvid) _xvid=yes ;; --disable-xvid) _xvid=no ;; + --enable-xvid-lavc) _xvid_lavc=yes ;; + --disable-xvid-lavc) _xvid_lavc=no ;; --enable-x264) _x264=yes ;; --disable-x264) _x264=no ;; + --enable-x264-lavc) _x264_lavc=yes ;; + --disable-x264-lavc) _x264_lavc=no ;; --enable-libnut) _libnut=yes ;; --disable-libnut) _libnut=no ;; --enable-libavutil_a) _libavutil_a=yes ;; @@ -6028,20 +6044,21 @@ EOF fi if test "$_faac" = yes ; then _def_faac="#define HAVE_FAAC 1" - if echo $_libavencoders | grep -q FAAC ; then - _faac_lavc=yes + test "$_faac_lavc" = auto && _faac_lavc=yes + if test "$_faac_lavc" = yes ; then _def_faac_lavc="#define CONFIG_LIBFAAC 1" _libs_mplayer="$_libs_mplayer $_ld_faac" - else - _faac_lavc=no - _def_faac_lavc="#undef CONFIG_LIBFAAC" + _libavencoders="$_libavencoders LIBFAAC_ENCODER" fi _codecmodules="faac $_codecmodules" else + _faac_lavc=no _def_faac="#undef HAVE_FAAC" + _def_faac_lavc="#undef CONFIG_LIBFAAC" _nocodecmodules="faac $_nocodecmodules" fi -echores "$_faac (in libavcodec: $_faac_lavc)" +_res_comment="in libavcodec: $_faac_lavc" +echores "$_faac" echocheck "FAAD2 (AAC) support" @@ -6546,14 +6563,15 @@ else fi echores "$_xvid" -if test "$_xvid" = yes ; then - echocheck "XviD two pass plugin" +echocheck "XviD two pass plugin" +if test "$_xvid" = yes && test "$_xvid_lavc" = auto ; then cat > $TMPC << EOF #include int main(void) { xvid_plugin_2pass2_t s; s.vbv_size=0; return 0; } EOF - if cc_check ; then - _xvid_lavc=yes + cc_check && _xvid_lavc=yes +fi + if test "$_xvid_lavc" = yes ; then _def_xvid_lavc='#define CONFIG_LIBXVID 1' _libavencoders="$_libavencoders LIBXVID_ENCODER" else @@ -6561,7 +6579,6 @@ EOF _def_xvid_lavc='#undef CONFIG_LIBXVID' fi echores "$_xvid_lavc" -fi echocheck "x264" @@ -6583,14 +6600,19 @@ fi if test "$_x264" = yes ; then _def_x264='#define HAVE_X264 1' _codecmodules="x264 $_codecmodules" + test "$_x264_lavc" = auto && _x264_lavc=yes + if test "$_x264_lavc" = yes ; then _def_x264_lavc='#define CONFIG_LIBX264 1' _libs_mplayer="$_libs_mplayer $_ld_x264" _libavencoders="$_libavencoders LIBX264_ENCODER" + fi else + _x264_lavc=no _def_x264='#undef HAVE_X264' _def_x264_lavc='#undef CONFIG_LIBX264' _nocodecmodules="x264 $_nocodecmodules" fi +_res_comment="in libavcodec: $_x264_lavc" echores "$_x264" @@ -6672,18 +6694,18 @@ EOF int main(void) { lame_set_preset(NULL, MEDIUM_FAST); return 0; } EOF cc_check $_ld_mp3lame $_ld_lm && _def_mp3lame_preset_medium="#define HAVE_MP3LAME_PRESET_MEDIUM" - if echo $_libavencoders | grep -q MP3LAME ; then - _mp3lame_lavc=yes + test "$_mp3lame_lavc" = auto && _mp3lame_lavc=yes + if test "$_mp3lame_lavc" = yes ; then _def_mp3lame_lavc="#define CONFIG_LIBMP3LAME 1" _libavencoders="$_libavencoders LIBMP3LAME_ENCODER" _libs_mplayer="$_libs_mplayer $_ld_mp3lame" - else - _mp3lame_lavc=no - _def_mp3lame_lavc="#undef CONFIG_LIBMP3LAME" fi else + _mp3lame_lavc=no _def_mp3lame='#undef HAVE_MP3LAME' + _def_mp3lame_lavc="#undef CONFIG_LIBMP3LAME" fi +_res_comment="in libavcodec: $_mp3lame_lavc" echores "$_mp3lame" fi @@ -7766,7 +7788,7 @@ CONFIG_LIBAMR_WB=$_libamr_wb CONFIG_LIBFAAC=$_faac_lavc CONFIG_LIBMP3LAME=$_mp3lame_lavc CONFIG_LIBVORBIS=$_libvorbis -CONFIG_LIBX264=$_x264 +CONFIG_LIBX264=$_x264_lavc CONFIG_LIBXVID=$_xvid_lavc CONFIG_MLIB = $_mlib # Prevent building libavcodec/imgresample.c with conflicting symbols -- cgit v1.2.3 From 5f377b0985bd017c548b2f78bf2ac12a334a89ce Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 9 May 2008 00:02:27 +0000 Subject: cosmetics: indentation git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26701 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/configure b/configure index 5e115d2fea..76465d0060 100755 --- a/configure +++ b/configure @@ -6571,14 +6571,14 @@ int main(void) { xvid_plugin_2pass2_t s; s.vbv_size=0; return 0; } EOF cc_check && _xvid_lavc=yes fi - if test "$_xvid_lavc" = yes ; then - _def_xvid_lavc='#define CONFIG_LIBXVID 1' - _libavencoders="$_libavencoders LIBXVID_ENCODER" - else - _xvid_lavc=no - _def_xvid_lavc='#undef CONFIG_LIBXVID' - fi - echores "$_xvid_lavc" +if test "$_xvid_lavc" = yes ; then + _def_xvid_lavc='#define CONFIG_LIBXVID 1' + _libavencoders="$_libavencoders LIBXVID_ENCODER" +else + _xvid_lavc=no + _def_xvid_lavc='#undef CONFIG_LIBXVID' +fi +echores "$_xvid_lavc" echocheck "x264" @@ -6671,14 +6671,14 @@ echocheck "libmp3lame (for mencoder)" _def_mp3lame_preset='#undef HAVE_MP3LAME_PRESET' _def_mp3lame_preset_medium='#undef HAVE_MP3LAME_PRESET_MEDIUM' if test "$_mp3lame" = auto ; then -_mp3lame=no -cat > $TMPC < $TMPC < int main(void) { lame_version_t lv; (void) lame_init(); get_lame_version_numerical(&lv); printf("%d%d\n",lv.major,lv.minor); return 0; } EOF -cc_check -lmp3lame $_ld_lm && tmp_run && _mp3lame=yes + cc_check -lmp3lame $_ld_lm && tmp_run && _mp3lame=yes fi if test "$_mp3lame" = yes ; then _def_mp3lame="#define HAVE_MP3LAME" -- cgit v1.2.3 From e6f301c8ae5b66a86ecc04cae0a0180c1b161e59 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 9 May 2008 12:00:25 +0000 Subject: Use full path for #includes from another directory. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26702 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libswscale/rgb2rgb.c | 4 ++-- libswscale/swscale-example.c | 2 +- libswscale/swscale.c | 4 ++-- libswscale/swscale_internal.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libswscale/rgb2rgb.c b/libswscale/rgb2rgb.c index faf3e95c64..19487d731d 100644 --- a/libswscale/rgb2rgb.c +++ b/libswscale/rgb2rgb.c @@ -27,11 +27,11 @@ */ #include #include "config.h" +#include "libavutil/x86_cpu.h" +#include "libavutil/bswap.h" #include "rgb2rgb.h" #include "swscale.h" #include "swscale_internal.h" -#include "x86_cpu.h" -#include "bswap.h" #define FAST_BGR2YV12 // use 7 bit coeffs instead of 15bit diff --git a/libswscale/swscale-example.c b/libswscale/swscale-example.c index 0b6eff18bb..79e21a922a 100644 --- a/libswscale/swscale-example.c +++ b/libswscale/swscale-example.c @@ -25,7 +25,7 @@ #include #undef HAVE_AV_CONFIG_H -#include "avutil.h" +#include "libavutil/avutil.h" #include "swscale.h" #include "swscale_internal.h" #include "rgb2rgb.h" diff --git a/libswscale/swscale.c b/libswscale/swscale.c index a74963f32c..a30ebe9477 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -69,9 +69,9 @@ untested special converters #endif #include "swscale.h" #include "swscale_internal.h" -#include "x86_cpu.h" -#include "bswap.h" #include "rgb2rgb.h" +#include "libavutil/x86_cpu.h" +#include "libavutil/bswap.h" #include "libavcodec/opt.h" #undef MOVNTQ diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 5083c455b3..d8dc974ac1 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -27,7 +27,7 @@ #include #endif -#include "avutil.h" +#include "libavutil/avutil.h" #define MAX_FILTER_SIZE 256 -- cgit v1.2.3 From 0b1b4814a8628f5c1d66fe3525bc0ff3977cec55 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 9 May 2008 12:38:33 +0000 Subject: Sync with latest FFmpeg changes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26703 b3059339-0415-0410-9bf9-f77b7e298cf2 --- common.mak | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/common.mak b/common.mak index 1fbdf2b489..88a816efed 100644 --- a/common.mak +++ b/common.mak @@ -12,8 +12,7 @@ vpath %.S $(SRC_DIR) ALLFFLIBS = avcodec avdevice avfilter avformat avutil postproc swscale CFLAGS = -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ - -D_ISOC9X_SOURCE -I$(BUILD_ROOT) -I$(SRC_PATH) \ - $(addprefix -I$(SRC_PATH)/lib,$(ALLFFLIBS)) $(OPTFLAGS) + -D_ISOC9X_SOURCE -I$(BUILD_ROOT) -I$(SRC_PATH) $(OPTFLAGS) %.o: %.c $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $< @@ -33,6 +32,8 @@ CFLAGS = -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ %.d: %.cpp $(DEPEND_CMD) > $@ +%$(EXESUF): %.c + install: install-libs install-headers uninstall: uninstall-libs uninstall-headers @@ -70,11 +71,14 @@ LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a *.exp *.map DISTCLEANSUFFIXES = *.d define RULES -$(SUBDIR)%: $(SUBDIR)%.o $(LIBNAME) - $(CC) $(FFLDFLAGS) -o $$@ $$^ $(FFEXTRALIBS) +$(SUBDIR)%$(EXESUF): $(SUBDIR)%.o + $(CC) $(FFLDFLAGS) -o $$@ $$^ $(SUBDIR)$(LIBNAME) $(FFEXTRALIBS) + +$(SUBDIR)%-test.o: $(SUBDIR)%.c + $(CC) $(CFLAGS) -DTEST -c -o $$@ $$^ -$(SUBDIR)%-test$(EXESUF): $(SUBDIR)%.c $(LIBNAME) - $(CC) $(CFLAGS) $(FFLDFLAGS) -DTEST -o $$@ $$^ $(FFEXTRALIBS) +$(SUBDIR)%-test.o: $(SUBDIR)%-test.c + $(CC) $(CFLAGS) -DTEST -c -o $$@ $$^ clean:: rm -f $(TESTS) $(addprefix $(SUBDIR),$(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \ @@ -87,9 +91,6 @@ endef $(eval $(RULES)) -# Clear DIRS variable so that it is not used in other subdirectories. -DIRS = - tests: $(TESTS) -include $(DEPS) -- cgit v1.2.3 From f6318795defbcdc06d65343c7a8478b8ef6906f9 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 9 May 2008 12:39:04 +0000 Subject: FFmpeg parts no longer require extra -I CFLAGS. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26704 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 -- configure | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 6bf6955f4d..0783f866d9 100644 --- a/Makefile +++ b/Makefile @@ -772,8 +772,6 @@ dvdread/%.o dvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE $(LIBDVDCSS_DVDR libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\" libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE -libmpdemux/demux_lavf.o libmpdemux/demux_lavf.d libmpdemux/mp_taglists.o libmpdemux/mp_taglists.d: CFLAGS += -Ilibavcodec - loader/% loader/%: CFLAGS += -Iloader -fno-omit-frame-pointer $(CFLAG_NO_OMIT_LEAF_FRAME_POINTER) #loader/%.o loader/%.d: CFLAGS += -Ddbg_printf=__vprintf -DTRACE=__vprintf -DDETAILED_OUT loader/win32.o loader/win32.d: CFLAGS += $(CFLAG_STACKREALIGN) diff --git a/configure b/configure index 76465d0060..891347d39c 100755 --- a/configure +++ b/configure @@ -7527,7 +7527,7 @@ if test "$_dvdread_internal" = yes || test "$_faad_internal" = yes ; then CFLAGS="$CFLAGS -DHAVE_CONFIG_H" fi -CFLAGS="-I. -Ilibavutil $CFLAGS" +CFLAGS="-I. $CFLAGS" CXXFLAGS=" $CFLAGS -D__STDC_LIMIT_MACROS" cat > $TMPC << EOF -- cgit v1.2.3 From a30748208ad72ead0a929d04b8e959d82fea1c42 Mon Sep 17 00:00:00 2001 From: gpoirier Date: Fri, 9 May 2008 12:44:30 +0000 Subject: sync w/r26674 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26705 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/man/fr/mplayer.1 | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/DOCS/man/fr/mplayer.1 b/DOCS/man/fr/mplayer.1 index a6ba23369a..6cedee69f0 100644 --- a/DOCS/man/fr/mplayer.1 +++ b/DOCS/man/fr/mplayer.1 @@ -1,4 +1,4 @@ -.\" synced with r26460 +.\" synced with r26674 .\" Encoding: iso-8859-1 .\" MPlayer (C) 2000-2008 MPlayer Team .\" The English man page was/is done by Gabucino, Diego Biurrun, Jonas Jermann @@ -48,7 +48,7 @@ mencoder \- Encodeur vid .na .nh .B mplayer -[options] [fichier||liste de lecture |\-] +[options] [fichier|URL|liste de lecture |\-] . .br .B mplayer @@ -73,12 +73,12 @@ vcd://piste[/p . .br .B mplayer -tv://[canal][/identifiant de l'entrée] +tv://[chaîne][/identifiant de l'entrée] [options] . .br .B mplayer -radio://[canal|fréquence][/capture] +radio://[chaîne|fréquence][/capture] [options] . .br @@ -108,8 +108,8 @@ cue://fichier[:piste] . .br .B mplayer -[file mms[t]|http|http_proxy|rt[s]p|ftp|udp|unsv|smb] :// -[utilisateur:motdepasse@]URL[:port] [options] +[file|mms[t]|http|http_proxy|rt[s]p|ftp|udp|unsv|smb]:// +[utilisateur:mot_de_passe@]URL[:port] [options] . .br .B mplayer @@ -133,7 +133,7 @@ tivo://h .br .B mencoder [options] fichier -[fichier|URL|\-] [\-o fichier | file://fichier | smb://[user:pass@]host/filepath] +[fichier|URL|\-] [\-o fichier | file://fichier | smb://[utilisateur:mot_de_passe@]hôte/chemin/vers/le/fichier] . .br .B mencoder @@ -153,8 +153,8 @@ Unices et processeurs non\-x86, voir la documentation). Il joue la plupart des formats MPEG/\:VOB, AVI, ASF/\:WMA/\:WMV, RM, QT/\:MOV/\:MP4, Ogg/\:OGM, VIVO, FLI, NuppelVideo, yuv4mpeg, FILM et RoQ, gérés par plusieurs codecs natifs et par des codecs binaires. -Vous pouvez regarder des Vidéos CD, SVCD, DVD, 3ivx, DivX 3/4/5 et -même des films WMV. +Vous pouvez regarder des films VCD, SVCD, DVD, 3ivx, DivX 3/4/5, WMV et +même H.264. .PP Un autre gros atout de MPlayer est la grande variété de pilotes de sortie audio et vidéos gérés. @@ -3950,9 +3950,10 @@ Sa d . .TP .B "gl2\ \ \ \ " -Pilote de sortie vidéo OpenGL, seconde génération. -Gère l'OSD et les vidéos de taille supérieure à la taille maximum d'une -texture. +Variante du pilote de sortie vidéo OpenGL. +Gère les vidéos de taille supérieure à la taille maximale d'une texture, +mais n'offre ni les fonctionnalités avancées, ni optimisations du pilote +de sortie vidéo gl et a très peu de chances d'être amélioré à l'avenir. .PD 0 .RSs .IPs (no)glfinish -- cgit v1.2.3 From 429e8afc84760a3916b611ff6f341279fd8bb237 Mon Sep 17 00:00:00 2001 From: superdump Date: Fri, 9 May 2008 12:47:55 +0000 Subject: Remove in_asm_used_var_warning_killer() Patch by Keiji Costantini ( strites gmail com ) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26706 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libswscale/swscale.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/libswscale/swscale.c b/libswscale/swscale.c index a30ebe9477..bca92ab6fb 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -362,16 +362,6 @@ const char *sws_format_name(enum PixelFormat format) } } -#if defined(ARCH_X86) && defined (CONFIG_GPL) -void in_asm_used_var_warning_killer() -{ - volatile int i= bF8+bFC+w10+ - bm00001111+bm00000111+bm11111000+b16Mask+g16Mask+r16Mask+b15Mask+g15Mask+r15Mask+ - ff_M24A+ff_M24B+ff_M24C+w02 + b5Dither+g5Dither+r5Dither+g6Dither+ff_dither4[0]+ff_dither8[0]+bm01010101; - if (i) i=0; -} -#endif - static inline void yuv2yuvXinC(int16_t *lumFilter, int16_t **lumSrc, int lumFilterSize, int16_t *chrFilter, int16_t **chrSrc, int chrFilterSize, uint8_t *dest, uint8_t *uDest, uint8_t *vDest, int dstW, int chrDstW) -- cgit v1.2.3 From 82b8b8dbe7202b22026cec6081769525c1d2cf03 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 9 May 2008 17:47:19 +0000 Subject: cosmetics: Move some stuff around for more logical grouping. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26707 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 142 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 71 insertions(+), 71 deletions(-) diff --git a/Makefile b/Makefile index 0783f866d9..b35e4ded37 100644 --- a/Makefile +++ b/Makefile @@ -638,12 +638,6 @@ INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mplayer-man INSTALL_TARGETS-$(GUI) += install-gui INSTALL_TARGETS += $(INSTALL_TARGETS-yes) -PARTS = libavcodec \ - libavformat \ - libavutil \ - libpostproc \ - libswscale \ - DIRS = . \ dvdread \ gui \ @@ -691,6 +685,12 @@ DIRS = . \ TOOLS \ vidix \ +PARTS = libavcodec \ + libavformat \ + libavutil \ + libpostproc \ + libswscale \ + all: $(ALL_PRG) %.d: %.c @@ -702,44 +702,18 @@ all: $(ALL_PRG) %.d: %.m $(MPDEPEND_CMD) > $@ -%.ho: %.h - $(CC) $(CFLAGS) -Wno-unused -c -o $@ -x c $< - %.o: %.m $(CC) $(CFLAGS) -c -o $@ $< -codec-cfg.d: codecs.conf.h -mencoder.d mplayer.d vobsub.d gui/win32/gui.d libmpdemux/muxer_avi.d stream/network.d stream/stream_cddb.d: version.h -DEPS = $(filter-out %.S,$(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON) $(SRCS_MPLAYER:.m=.d) $(SRCS_MENCODER)))) -$(DEPS): help_mp.h +%.ho: %.h + $(CC) $(CFLAGS) -Wno-unused -c -o $@ -x c $< + +ALLHEADERS = $(foreach dir,$(DIRS),$(wildcard $(dir)/*.h)) +checkheaders: $(ALLHEADERS:.h=.ho) dep depend: $(DEPS) for part in $(PARTS); do $(MAKE) -C $$part depend; done -# rebuild version.h each time the working copy is updated -ifeq ($(wildcard .svn/entries),.svn/entries) -version.h: .svn/entries -endif -version.h: - ./version.sh `$(CC) -dumpversion` - -help_mp.h: help/help_mp-en.h $(HELP_FILE) - @echo '// WARNING! This is a generated file. Do NOT edit.' > help_mp.h - @echo '// See the help/ subdir for the editable files.' >> help_mp.h - @echo '#ifndef MPLAYER_HELP_MP_H' >> help_mp.h - @echo '#define MPLAYER_HELP_MP_H' >> help_mp.h -ifeq ($(CHARSET),) - @echo '#include "$(HELP_FILE)"' >> help_mp.h -else - iconv -f UTF-8 -t $(CHARSET) "$(HELP_FILE)" >> help_mp.h -endif - @echo '#endif /* MPLAYER_HELP_MP_H */' >> help_mp.h - -ifneq ($(HELP_FILE),help/help_mp-en.h) - @echo '// untranslated messages from the English master file:' >> help_mp.h - @help/help_diff.sh $(HELP_FILE) < help/help_mp-en.h >> help_mp.h -endif - define RECURSIVE_RULE $(part)/$(part).a: recurse $(MAKE) -C $(part) @@ -768,6 +742,41 @@ codec-cfg-test$(EXESUF): codecs.conf.h codec-cfg.h mp_msg.o osdep/getch2.o osdep/mplayer-rc.o: osdep/mplayer.rc version.h $(WINDRES) -o $@ $< +# ./configure must be rerun if it changed +config.mak: configure + @echo "############################################################" + @echo "####### Please run ./configure again - it's changed! #######" + @echo "############################################################" + +# rebuild version.h each time the working copy is updated +ifeq ($(wildcard .svn/entries),.svn/entries) +version.h: .svn/entries +endif +version.h: + ./version.sh `$(CC) -dumpversion` + +help_mp.h: help/help_mp-en.h $(HELP_FILE) + @echo '// WARNING! This is a generated file. Do NOT edit.' > help_mp.h + @echo '// See the help/ subdir for the editable files.' >> help_mp.h + @echo '#ifndef MPLAYER_HELP_MP_H' >> help_mp.h + @echo '#define MPLAYER_HELP_MP_H' >> help_mp.h +ifeq ($(CHARSET),) + @echo '#include "$(HELP_FILE)"' >> help_mp.h +else + iconv -f UTF-8 -t $(CHARSET) "$(HELP_FILE)" >> help_mp.h +endif + @echo '#endif /* MPLAYER_HELP_MP_H */' >> help_mp.h + +ifneq ($(HELP_FILE),help/help_mp-en.h) + @echo '// untranslated messages from the English master file:' >> help_mp.h + @help/help_diff.sh $(HELP_FILE) < help/help_mp-en.h >> help_mp.h +endif + +codec-cfg.d: codecs.conf.h +mencoder.d mplayer.d vobsub.d gui/win32/gui.d libmpdemux/muxer_avi.d stream/network.d stream/stream_cddb.d: version.h +DEPS = $(filter-out %.S,$(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON) $(SRCS_MPLAYER:.m=.d) $(SRCS_MENCODER)))) +$(DEPS): help_mp.h + dvdread/%.o dvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE $(LIBDVDCSS_DVDREAD_FLAGS) libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\" libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE @@ -789,29 +798,6 @@ VIDIX_OBJS = $(filter vidix/%,$(SRCS_MPLAYER:.c=.o)) $(VIDIX_DEPS) $(VIDIX_OBJS): $(VIDIX_PCI_FILES) -TEST_OBJS = mp_msg-mencoder.o mp_fifo.o osdep/$(GETCH) osdep/$(TIMER) -ltermcap -lm - -liba52/test$(EXESUF): liba52/test.c cpudetect.o $(filter liba52/%,$(SRCS_COMMON:.c=.o)) - -libvo/aspecttest$(EXESUF): libvo/aspecttest.c libvo/aspect.o libvo/geometry.o $(TEST_OBJS) - -LOADER_TEST_OBJS = $(filter loader/%,$(SRCS_COMMON:.c=.o)) libmpdemux/aviprint.o osdep/mmap_anon.o cpudetect.o $(TEST_OBJS) - -loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): CFLAGS += -g -loader/qtx/list$(EXESUF): loader/qtx/list.c $(LOADER_TEST_OBJS) -loader/qtx/qtxload$(EXESUF): loader/qtx/qtxload.c $(LOADER_TEST_OBJS) - -mp3lib/test$(EXESUF): mp3lib/test.c $(filter mp3lib/%,$(SRCS_COMMON:.c=.o)) libvo/aclib.o cpudetect.o $(TEST_OBJS) -mp3lib/test2$(EXESUF): mp3lib/test2.c $(filter mp3lib/%,$(SRCS_COMMON:.c=.o)) libvo/aclib.o cpudetect.o $(TEST_OBJS) - -TESTS = liba52/test$(EXESUF) libvo/aspecttest$(EXESUF) \ - loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF) \ - mp3lib/test$(EXESUF) mp3lib/test2$(EXESUF) - -tests: $(TESTS) - -testsclean: - rm -f $(TESTS) install: install-dirs $(INSTALL_TARGETS) @@ -880,6 +866,11 @@ distclean: clean doxygen_clean testsclean toolsclean codec-cfg$(EXESUF) codecs2html$(EXESUF) codec-cfg-test$(EXESUF) \ cpuinfo$(EXESUF) TAGS tags +doxygen: + doxygen DOCS/tech/Doxyfile + +doxygen_clean: + -rm -rf DOCS/tech/doxygen strip: strip -s $(ALL_PRG) @@ -889,21 +880,30 @@ TAGS: tags: rm -f $@; ( find -name '*.[chS]' -print ) | xargs ctags -a -ALLHEADERS = $(foreach dir,$(DIRS),$(wildcard $(dir)/*.h)) -checkheaders: $(ALLHEADERS:.h=.ho) -# ./configure must be rerun if it changed -config.mak: configure - @echo "############################################################" - @echo "####### Please run ./configure again - it's changed! #######" - @echo "############################################################" +TEST_OBJS = mp_msg-mencoder.o mp_fifo.o osdep/$(GETCH) osdep/$(TIMER) -ltermcap -lm -doxygen: - doxygen DOCS/tech/Doxyfile +liba52/test$(EXESUF): liba52/test.c cpudetect.o $(filter liba52/%,$(SRCS_COMMON:.c=.o)) -doxygen_clean: - -rm -rf DOCS/tech/doxygen +libvo/aspecttest$(EXESUF): libvo/aspecttest.c libvo/aspect.o libvo/geometry.o $(TEST_OBJS) +LOADER_TEST_OBJS = $(filter loader/%,$(SRCS_COMMON:.c=.o)) libmpdemux/aviprint.o osdep/mmap_anon.o cpudetect.o $(TEST_OBJS) + +loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): CFLAGS += -g +loader/qtx/list$(EXESUF): loader/qtx/list.c $(LOADER_TEST_OBJS) +loader/qtx/qtxload$(EXESUF): loader/qtx/qtxload.c $(LOADER_TEST_OBJS) + +mp3lib/test$(EXESUF): mp3lib/test.c $(filter mp3lib/%,$(SRCS_COMMON:.c=.o)) libvo/aclib.o cpudetect.o $(TEST_OBJS) +mp3lib/test2$(EXESUF): mp3lib/test2.c $(filter mp3lib/%,$(SRCS_COMMON:.c=.o)) libvo/aclib.o cpudetect.o $(TEST_OBJS) + +TESTS = liba52/test$(EXESUF) libvo/aspecttest$(EXESUF) \ + loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF) \ + mp3lib/test$(EXESUF) mp3lib/test2$(EXESUF) + +tests: $(TESTS) + +testsclean: + rm -f $(TESTS) TOOLS = TOOLS/alaw-gen$(EXESUF) \ TOOLS/asfinfo$(EXESUF) \ -- cgit v1.2.3 From f7924f3fdd1ab3c9092f6742b86f64196929ca93 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 9 May 2008 17:51:44 +0000 Subject: Add some comment headings to divide the Makefile into logical chapters. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26708 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/Makefile b/Makefile index b35e4ded37..62175bf195 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,9 @@ include config.mak + +###### variable declarations ####### + COMMON_LDFLAGS += $(EXTRA_LIB)\ $(EXTRALIBS) \ @@ -691,6 +694,10 @@ PARTS = libavcodec \ libpostproc \ libswscale \ + + +###### generic rules ####### + all: $(ALL_PRG) %.d: %.c @@ -772,6 +779,10 @@ ifneq ($(HELP_FILE),help/help_mp-en.h) @help/help_diff.sh $(HELP_FILE) < help/help_mp-en.h >> help_mp.h endif + + +###### dependency declarations / specific CFLAGS ###### + codec-cfg.d: codecs.conf.h mencoder.d mplayer.d vobsub.d gui/win32/gui.d libmpdemux/muxer_avi.d stream/network.d stream/stream_cddb.d: version.h DEPS = $(filter-out %.S,$(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON) $(SRCS_MPLAYER:.m=.d) $(SRCS_MENCODER)))) @@ -799,6 +810,9 @@ VIDIX_OBJS = $(filter vidix/%,$(SRCS_MPLAYER:.c=.o)) $(VIDIX_DEPS) $(VIDIX_OBJS): $(VIDIX_PCI_FILES) + +###### installation rules ####### + install: install-dirs $(INSTALL_TARGETS) install-dirs: @@ -881,6 +895,9 @@ tags: rm -f $@; ( find -name '*.[chS]' -print ) | xargs ctags -a + +###### tests / tools ####### + TEST_OBJS = mp_msg-mencoder.o mp_fifo.o osdep/$(GETCH) osdep/$(TIMER) -ltermcap -lm liba52/test$(EXESUF): liba52/test.c cpudetect.o $(filter liba52/%,$(SRCS_COMMON:.c=.o)) -- cgit v1.2.3 From c5d4e7908dded1602da7fc0c9dfa1d569c875661 Mon Sep 17 00:00:00 2001 From: reimar Date: Sat, 10 May 2008 11:48:17 +0000 Subject: Add ati-hack suboption that aligns the lines to 32/64 bytes for PBO transfers to avoid what is probably a bug in the driver. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26709 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/vo_gl.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index 68a8354e54..e538ca6b36 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -80,6 +80,7 @@ static uint32_t image_width; static uint32_t image_height; static uint32_t image_format; static int many_fmts; +static int ati_hack; static int use_glFinish; static int swap_interval; static GLenum gl_target; @@ -672,6 +673,8 @@ static uint32_t get_image(mp_image_t *mpi) { if (!gl_buffer) GenBuffers(1, &gl_buffer); BindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer); + if (ati_hack) + mpi->width = (mpi->width + 63) & ~63; mpi->stride[0] = mpi->width * mpi->bpp / 8; if (mpi->stride[0] * mpi->height > gl_buffersize) { BufferData(GL_PIXEL_UNPACK_BUFFER, mpi->stride[0] * mpi->height, @@ -789,6 +792,7 @@ static opt_t subopts[] = { {"yuv", OPT_ARG_INT, &use_yuv, (opt_test_f)int_non_neg}, {"lscale", OPT_ARG_INT, &lscale, (opt_test_f)int_non_neg}, {"cscale", OPT_ARG_INT, &cscale, (opt_test_f)int_non_neg}, + {"ati-hack", OPT_ARG_BOOL, &ati_hack, NULL}, {"glfinish", OPT_ARG_BOOL, &use_glFinish, NULL}, {"swapinterval", OPT_ARG_INT, &swap_interval,NULL}, {"customprog", OPT_ARG_MSTRZ,&custom_prog, NULL}, @@ -811,6 +815,7 @@ static int preinit(const char *arg) cscale = 0; use_rectangle = 0; use_glFinish = 0; + ati_hack = 0; swap_interval = 1; slice_height = 0; custom_prog = NULL; @@ -835,6 +840,8 @@ static int preinit(const char *arg) " 0: use power-of-two textures\n" " 1: use texture_rectangle\n" " 2: use texture_non_power_of_two\n" + " ati-hack\n" + " Workaround ATI bug with PBOs\n" " glfinish\n" " Call glFinish() before swapping buffers\n" " swapinterval=\n" -- cgit v1.2.3 From ca91eee881757f241c9e141f6d0fa6e6d7263414 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 10 May 2008 12:07:06 +0000 Subject: Remove outdated FIXME comment. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26710 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 -- 1 file changed, 2 deletions(-) diff --git a/configure b/configure index 891347d39c..4040a254c1 100755 --- a/configure +++ b/configure @@ -2479,8 +2479,6 @@ EOF # if altivec is enabled, make sure the correct flags turn up in CFLAGS if test "$_altivec" = yes ; then - #FIXME: _mcpu is used for CFLAGS, this needs to be set earlier - #_mcpu="$_mcpu $_altivec_gcc_flags" CFLAGS="$CFLAGS $_altivec_gcc_flags" fi fi -- cgit v1.2.3 From cac788de05de6fc25d97444fad74e31c249529c9 Mon Sep 17 00:00:00 2001 From: gpoirier Date: Sat, 10 May 2008 12:11:05 +0000 Subject: Consistency fix: all DVD encoding examples had ":aspect=16/9" option, so put it everywhere else. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26711 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/en/encoding-guide.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/DOCS/xml/en/encoding-guide.xml b/DOCS/xml/en/encoding-guide.xml index ee69383ae4..8f7460a02e 100644 --- a/DOCS/xml/en/encoding-guide.xml +++ b/DOCS/xml/en/encoding-guide.xml @@ -5504,7 +5504,7 @@ mencoder -oac copy -ovc lavc -of mpeg -mpegopts format=dvd:tsaf:telecine \ mencoder