Author: laxathom Update of /cvs/free/rpms/streamdvd/F-8 In directory se02.es.rpmfusion.net:/tmp/cvs-serv6859 Added Files: streamdvd-lsdvd.patch streamdvd-streamdvd.patch Log Message: Add missing files streamdvd-lsdvd.patch: --- NEW FILE streamdvd-lsdvd.patch --- --- contrib/lsdvd/lsdvd.c.orig 2005-06-14 17:25:19.000000000 +0200 +++ contrib/lsdvd/lsdvd.c 2005-06-14 17:31:58.000000000 +0200 @@ -32,6 +32,14 @@ printf("%s => ", name); \ printf(x); printf(",\n"); \ } +#define HASHI(name) { \ + INDENT; \ + (name ? \ + printf((_lvl ? "%d => {\n" : "our %%%d = (\n"), name) : \ + printf("{\n")); \ + _lvl++; _lvl_type[_lvl] = 0; \ +} + #define HASH(name) { \ INDENT; \ (name ? \ @@ -287,7 +295,7 @@ pgc = vts_pgcit->pgci_srp[ifo[title_set_nr]->vts_ptt_srpt->title[vts_ttn - 1].ptt[0].pgcn - 1].pgc; if (opt_p) { - HASH(0); + HASHI(0); DEF("ix", "%d", j+1); DEF("length", "%.3f", dvdtime2msec(&pgc->playback_time)/1000.0); DEF("vts_id", "'%.12s'", vtsi_mat->vts_identifier); @@ -343,7 +351,7 @@ audio_attr = &vtsi_mat->vts_audio_attr[i]; sprintf(lang_code, "%c%c", audio_attr->lang_code>>8, audio_attr->lang_code & 0xff); if (!lang_code[0]) { lang_code[0] = 'x'; lang_code[1] = 'x'; } - HASH(0); + HASHI(0); DEF("ix", "%d", i+1); DEF("langcode", "'%s'", lang_code); DEF("language", "'%s'", lang_name(lang_code)); @@ -390,7 +398,7 @@ ms = ms + dvdtime2msec(&pgc->cell_playback[cell].playback_time); cell++; } - HASH(0); + HASHI(0); DEF("ix", "%d", i+1); DEF("length", "%.3f", ms/1000.0); DEF("startcell", "%d", pgc->program_map[i]); @@ -427,7 +435,7 @@ ARRAY("cell"); for (i=0; i<pgc->nr_of_cells; i++) { - HASH(0); + HASHI(0); DEF("ix", "%d", i+1); DEF("length", "%.3f", dvdtime2msec(&pgc->cell_playback[i].playback_time)/1000.0); RETURN; @@ -452,7 +460,7 @@ sprintf(lang_code, "%c%c", subp_attr->lang_code>>8, subp_attr->lang_code & 0xff); if (!lang_code[0]) { lang_code[0] = 'x'; lang_code[1] = 'x'; } - HASH(0); + HASHI(0); DEF("ix", "%d", i+1); DEF("langcode", "'%s'", lang_code); DEF("language", "'%s'", lang_name(lang_code)); streamdvd-streamdvd.patch: --- NEW FILE streamdvd-streamdvd.patch --- --- streamdvd.c.orig 2005-06-14 17:33:13.000000000 +0200 +++ streamdvd.c 2005-06-14 17:34:12.000000000 +0200 @@ -173,7 +173,7 @@ } pts_diff = ( (double)v_pts/90000. ) - ( (double)a_pts/90000. ); - gl->av_delay = pts_diff * 1000.; + gl->av_delay = (int)(pts_diff * 1000.); fprintf(stderr, "AV Delay: %d ms\n", gl->av_delay); } --- requant.c.orig 2005-06-14 17:36:50.000000000 +0200 +++ requant.c 2005-06-14 17:41:47.000000000 +0200 @@ -1308,10 +1308,10 @@ #define NEXT_MACROBLOCK \ do { \ h_offset += 16; \ - if (h_offset == horizontal_size_value) \ + if (h_offset == (int)horizontal_size_value) \ { \ v_offset += 16; \ - if (v_offset > (vertical_size_value - 16)) return; \ + if (v_offset > (int)(vertical_size_value - 16)) return; \ h_offset = 0; \ } \ } while (0) @@ -1431,7 +1431,7 @@ v_offset += 16; } - if (v_offset > (vertical_size_value - 16)) return 1; + if (v_offset > (int)(vertical_size_value - 16)) return 1; return 0;