September 2010 - MPlayer-cvslog - lists.mplayerhq.hu

r31194 - trunk/DOCS/tech/svn-howto.txt
by diego 10 Oct '10

10 Oct '10

Author: diego Date: Sun May 23 17:07:34 2010 New Revision: 31194 Log: K&R coding style should be applied to new code. Modified: trunk/DOCS/tech/svn-howto.txt Modified: trunk/DOCS/tech/svn-howto.txt ============================================================================== --- trunk/DOCS/tech/svn-howto.txt Sun May 23 16:15:27 2010 (r31193) +++ trunk/DOCS/tech/svn-howto.txt Sun May 23 17:07:34 2010 (r31194) @@ -261,13 +261,9 @@ II. POLICY / RULES: not apply to files you wrote and/or maintain. -6. We refuse source indentation and other cosmetic changes if they are mixed - with functional changes, such commits will be rejected and removed. Every - developer has his own indentation style, you should not change it. Of course - if you (re)write something, you can use your own style... (Many projects - force a given indentation style - we don't.) If you really need to make - indentation changes (try to avoid this), separate them strictly from real - changes. +6. Do not mix cosmetic changes (indentation, function / variable renaming and + similar) with functional changes in a single commit. Instead, commit such + changes as a separate commit of their own. NOTE: If you had to put if(){ .. } over a large (> 5 lines) chunk of code, do NOT change the indentation of the inner part (don't move it to the right)! @@ -328,6 +324,12 @@ II. POLICY / RULES: with our local changes. +15. Use K&R style with 4 space indentation, no tabs and no trailing whitespace. + Unnecessary braces should be avoided. This policy applies to new files. In + existing files that don't follow K&R style, try to respect the surrounding + style, but in doubt, go for K&R. + + Also read DOCS/tech/patches.txt !!!! We think our rules are not too hard. If you have comments, contact us.

4 5

r32419 - trunk/configure
by reimar 30 Sep '10

30 Sep '10

Author: reimar Date: Thu Sep 30 20:15:50 2010 New Revision: 32419 Log: 100l, actually add yasmdefines to YASMFLAGS. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Thu Sep 30 12:05:25 2010 (r32418) +++ trunk/configure Thu Sep 30 20:15:50 2010 (r32419) @@ -2706,7 +2706,7 @@ if test -z "$YASMFLAGS" ; then test "$pic" = "yes" && yasmdefines="$yasmdefines -DPIC" test -n "$extern_prefix" && yasmdefines="$yasmdefines -DPREFIX" - YASMFLAGS="-f $objformat" + YASMFLAGS="-f $objformat $yasmdefines" x86_64 && YASMFLAGS="$YASMFLAGS -m amd64" case "$objformat" in elf) test $_debug && YASMFLAGS="$YASMFLAGS -g dwarf2" ;;

1 0

r32276 - trunk/libass/ass_mp.c
by diego 30 Sep '10

30 Sep '10

Author: diego Date: Thu Sep 16 20:44:19 2010 New Revision: 32276 Log: Remove pointless fontconfig version #ifdef. We require at least version 2.0.4 of fontconfig, no need to check for it. Modified: trunk/libass/ass_mp.c Modified: trunk/libass/ass_mp.c ============================================================================== --- trunk/libass/ass_mp.c Thu Sep 16 17:48:04 2010 (r32275) +++ trunk/libass/ass_mp.c Thu Sep 16 20:44:19 2010 (r32276) @@ -42,11 +42,7 @@ float ass_font_scale = 1.; float ass_line_spacing = 0.; int ass_top_margin = 0; int ass_bottom_margin = 0; -#if defined(FC_VERSION) && (FC_VERSION >= 20402) int extract_embedded_fonts = 1; -#else -int extract_embedded_fonts = 0; -#endif char **ass_force_style_list = NULL; int ass_use_margins = 0; char* ass_color = NULL;

3 2

[propchange]: r32276 - svn:log
by diego 30 Sep '10

30 Sep '10

Author: diego Revision: 32276 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1,2 +1,2 @@ Remove pointless fontconfig version #ifdef. -We require at least version 2.0.4 of fontconfig, no need to check for it. +We require at least version 2.4.2 of fontconfig, no need to check for it.

1 0

r32417 - trunk/subreader.c
by cehoyos 30 Sep '10

30 Sep '10

Author: cehoyos Date: Thu Sep 30 11:10:35 2010 New Revision: 32417 Log: Use calloc instead of malloc and memset. Patch by Clément Bœsch, ubitux gmail Modified: trunk/subreader.c Modified: trunk/subreader.c ============================================================================== --- trunk/subreader.c Thu Sep 30 11:08:37 2010 (r32416) +++ trunk/subreader.c Thu Sep 30 11:10:35 2010 (r32417) @@ -1925,8 +1925,7 @@ char** sub_filenames(const char* path, c tmpresult = malloc(len); - result = malloc(sizeof(subfn)*MAX_SUBTITLE_FILES); - memset(result, 0, sizeof(subfn)*MAX_SUBTITLE_FILES); + result = calloc(MAX_SUBTITLE_FILES, sizeof(*result)); subcnt = 0; @@ -2064,8 +2063,7 @@ char** sub_filenames(const char* path, c qsort(result, subcnt, sizeof(subfn), compare_sub_priority); - result2 = malloc(sizeof(char*)*(subcnt+1)); - memset(result2, 0, sizeof(char*)*(subcnt+1)); + result2 = calloc(subcnt + 1, sizeof(*result2)); for (i = 0; i < subcnt; i++) { result2[i] = result[i].fname;

1 0

r32416 - trunk/subreader.c
by cehoyos 30 Sep '10

30 Sep '10

Author: cehoyos Date: Thu Sep 30 11:08:37 2010 New Revision: 32416 Log: Simplify comparison. Patch by Clément Bœsch, ubitux gmail Modified: trunk/subreader.c Modified: trunk/subreader.c ============================================================================== --- trunk/subreader.c Thu Sep 30 00:06:44 2010 (r32415) +++ trunk/subreader.c Thu Sep 30 11:08:37 2010 (r32416) @@ -1101,7 +1101,6 @@ static subtitle *sub_read_line_jacosub(s static int sub_autodetect (stream_t* st, int *uses_time, int utf16) { char line[LINE_LEN+1]; int i,j=0; - char p; while (j < 100) { j++; @@ -1145,7 +1144,7 @@ static int sub_autodetect (stream_t* st, {*uses_time=1;return SUB_PJS;} if (sscanf (line, "FORMAT=%d", &i) == 1) {*uses_time=0; return SUB_MPSUB;} - if (sscanf (line, "FORMAT=TIM%c", &p)==1 && p=='E') + if (!memcmp(line, "FORMAT=TIME", 11)) {*uses_time=1; return SUB_MPSUB;} if (strstr (line, "-->>")) {*uses_time=0; return SUB_AQTITLE;}

1 0

r32412 - in trunk: cfg-common.h stream/open.c stream/stream_bd.c stream/stream_bluray.c
by reimar 29 Sep '10

29 Sep '10

Author: reimar Date: Wed Sep 29 21:43:34 2010 New Revision: 32412 Log: Use bluray_device variable also for bd:// instead of dvd_device which does not make sense. Modified: trunk/cfg-common.h trunk/stream/open.c trunk/stream/stream_bd.c trunk/stream/stream_bluray.c Modified: trunk/cfg-common.h ============================================================================== --- trunk/cfg-common.h Wed Sep 29 21:06:03 2010 (r32411) +++ trunk/cfg-common.h Wed Sep 29 21:43:34 2010 (r32412) @@ -335,12 +335,11 @@ const m_option_t common_opts[] = { {"dvd-speed", "MPlayer was compiled without libdvdread support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, {"dvd", "MPlayer was compiled without libdvdread support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, #endif /* CONFIG_DVDREAD */ -#ifdef CONFIG_LIBBLURAY {"bluray-device", &bluray_device, CONF_TYPE_STRING, 0, 0, 0, NULL}, +#ifdef CONFIG_LIBBLURAY {"bluray-angle", &bluray_angle, CONF_TYPE_INT, CONF_RANGE, 0, 999, NULL}, {"bluray-chapter", &bluray_chapter, CONF_TYPE_INT, CONF_RANGE, 0, 999, NULL}, #else - {"bluray-device", "MPlayer was compiled without libbluray support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, {"bluray-angle", "MPlayer was compiled without libbluray support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, {"bluray-chapter", "MPlayer was compiled without libbluray support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, #endif /* CONFIG_LIBBLURAY */ Modified: trunk/stream/open.c ============================================================================== --- trunk/stream/open.c Wed Sep 29 21:06:03 2010 (r32411) +++ trunk/stream/open.c Wed Sep 29 21:43:34 2010 (r32412) @@ -44,6 +44,7 @@ int dvd_chapter=1; int dvd_last_chapter=0; char* dvd_device=NULL; int dvd_title=0; +char *bluray_device=NULL; // Open a new stream (stdin/file/vcd/url) Modified: trunk/stream/stream_bd.c ============================================================================== --- trunk/stream/stream_bd.c Wed Sep 29 21:06:03 2010 (r32411) +++ trunk/stream/stream_bd.c Wed Sep 29 21:43:34 2010 (r32412) @@ -452,8 +452,8 @@ static int bd_stream_open(stream_t *s, i if (p->device) bd->device = p->device; - else if (dvd_device) - bd->device = dvd_device; + else if (bluray_device) + bd->device = bluray_device; else bd->device = DEFAULT_BD_DEVICE; Modified: trunk/stream/stream_bluray.c ============================================================================== --- trunk/stream/stream_bluray.c Wed Sep 29 21:06:03 2010 (r32411) +++ trunk/stream/stream_bluray.c Wed Sep 29 21:43:34 2010 (r32412) @@ -46,7 +46,6 @@ #define BLURAY_DEFAULT_CHAPTER 0 #define BLURAY_DEFAULT_TITLE 0 -char *bluray_device = NULL; int bluray_angle = 0; int bluray_chapter = 0;

1 0

r32411 - trunk/spudec.c
by reimar 29 Sep '10

29 Sep '10

Author: reimar Date: Wed Sep 29 21:06:03 2010 New Revision: 32411 Log: Reindent. Modified: trunk/spudec.c Modified: trunk/spudec.c ============================================================================== --- trunk/spudec.c Wed Sep 29 21:05:13 2010 (r32410) +++ trunk/spudec.c Wed Sep 29 21:06:03 2010 (r32411) @@ -1368,20 +1368,20 @@ void spudec_set_paletted(void *this, con packet->start_row = y; packet->data_len = 2 * stride * h; if (packet->data_len) { // size 0 is a special "clear" packet - packet->packet = malloc(packet->data_len); - img = packet->packet; - aimg = packet->packet + stride * h; - for (i = 0; i < 256; i++) { - uint32_t pixel = pal[i]; - int alpha = pixel >> 24; - int gray = (((pixel & 0x000000ff) >> 0) + - ((pixel & 0x0000ff00) >> 7) + - ((pixel & 0x00ff0000) >> 16)) >> 2; - gray = FFMIN(gray, alpha); - g8a8_pal[i] = (-alpha << 8) | gray; - } - pal2gray_alpha(g8a8_pal, pal_img, pal_stride, - img, aimg, stride, w, h); + packet->packet = malloc(packet->data_len); + img = packet->packet; + aimg = packet->packet + stride * h; + for (i = 0; i < 256; i++) { + uint32_t pixel = pal[i]; + int alpha = pixel >> 24; + int gray = (((pixel & 0x000000ff) >> 0) + + ((pixel & 0x0000ff00) >> 7) + + ((pixel & 0x00ff0000) >> 16)) >> 2; + gray = FFMIN(gray, alpha); + g8a8_pal[i] = (-alpha << 8) | gray; + } + pal2gray_alpha(g8a8_pal, pal_img, pal_stride, + img, aimg, stride, w, h); } packet->start_pts = 0; packet->end_pts = 0x7fffffff;

1 0

r32410 - trunk/spudec.c
by reimar 29 Sep '10

29 Sep '10

Author: reimar Date: Wed Sep 29 21:05:13 2010 New Revision: 32410 Log: spudec: support "clear" packets that contain no data but instead clear the screen at a given time. Modified: trunk/spudec.c Modified: trunk/spudec.c ============================================================================== --- trunk/spudec.c Wed Sep 29 20:53:39 2010 (r32409) +++ trunk/spudec.c Wed Sep 29 21:05:13 2010 (r32410) @@ -1367,6 +1367,7 @@ void spudec_set_paletted(void *this, con packet->start_col = x; packet->start_row = y; packet->data_len = 2 * stride * h; + if (packet->data_len) { // size 0 is a special "clear" packet packet->packet = malloc(packet->data_len); img = packet->packet; aimg = packet->packet + stride * h; @@ -1381,6 +1382,7 @@ void spudec_set_paletted(void *this, con } pal2gray_alpha(g8a8_pal, pal_img, pal_stride, img, aimg, stride, w, h); + } packet->start_pts = 0; packet->end_pts = 0x7fffffff; if (pts != MP_NOPTS_VALUE)

1 0

r32409 - trunk/configure
by reimar 29 Sep '10

29 Sep '10

Author: reimar Date: Wed Sep 29 20:53:39 2010 New Revision: 32409 Log: Move config.asm back to root and append a '/' to SRC_PATH to fix compilation issues with nasm. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Wed Sep 29 20:26:12 2010 (r32408) +++ trunk/configure Wed Sep 29 20:53:39 2010 (r32409) @@ -8262,7 +8262,7 @@ YASMDEP = $_yasm YASMFLAGS = $YASMFLAGS CONFIG_STATIC = yes -SRC_PATH = ../.. +SRC_PATH = ../../ BUILD_ROOT = .. LIBPREF = lib LIBSUF = .a @@ -8850,7 +8850,7 @@ for part in $arch $subarch; do echo "%define ARCH_${part}" >> "$TMPS" done -cmp -s "$TMPS" ffmpeg/config.asm || mv -f "$TMPS" ffmpeg/config.asm +cmp -s "$TMPS" config.asm || mv -f "$TMPS" config.asm fi

1 0