[xiph-commits] r18939 - in experimental/giles: . mng
giles at svn.xiph.org
giles at svn.xiph.org
Fri May 10 14:04:55 PDT 2013
Author: giles
Date: 2013-05-10 14:04:55 -0700 (Fri, 10 May 2013)
New Revision: 18939
Modified:
experimental/giles/avidump.c
experimental/giles/jpegdump.c
experimental/giles/mng/mng.c
experimental/giles/mng/mngplay.c
experimental/giles/mp3.txt
experimental/giles/mp3dump.c
Log:
Remove trailing whitespace.
Modified: experimental/giles/avidump.c
===================================================================
--- experimental/giles/avidump.c 2013-05-08 22:46:56 UTC (rev 18938)
+++ experimental/giles/avidump.c 2013-05-10 21:04:55 UTC (rev 18939)
@@ -338,7 +338,7 @@
fprintf(out, " %d Hz", rate/scale);
fprintf(out, " %d bits per sample", samplesize*8);
-
+
fprintf(out, "\n flags 0x%08x", flags);
fprintf(out, "\n priority %d", priority);
fprintf(out, "\n language %d", language);
@@ -411,7 +411,7 @@
case 0x0102: fprintf(out, " (IBM aLAW)"); break;
case 0x0103: fprintf(out, " (IBM ADPCM)"); break;
default: fprintf(out, " (unknown)"); break;
- }
+ }
fprintf(out, " blockalign %d", blockalign);
fprintf(out, "\n datarate %d bytes per second", datarate);
Modified: experimental/giles/jpegdump.c
===================================================================
--- experimental/giles/jpegdump.c 2013-05-08 22:46:56 UTC (rev 18938)
+++ experimental/giles/jpegdump.c 2013-05-10 21:04:55 UTC (rev 18939)
@@ -14,8 +14,8 @@
#include <string.h>
#include <stdio.h>
-/* JPEG marker codes
- - these are the second bytes; a marker consistes of 0xff
+/* JPEG marker codes
+ - these are the second bytes; a marker consistes of 0xff
followed by the type codes given below. */
typedef enum {
Modified: experimental/giles/mng/mng.c
===================================================================
--- experimental/giles/mng/mng.c 2013-05-08 22:46:56 UTC (rev 18938)
+++ experimental/giles/mng/mng.c 2013-05-10 21:04:55 UTC (rev 18939)
@@ -40,10 +40,10 @@
bytes = fread(data, 1, 4, in);
if (bytes != 4) return -1;
-
+
*value = (data[0] << 24) | (data[1] << 16) | (data[2] << 8) | data[3];
- return 0;
+ return 0;
}
int put_uint32(unsigned char *buffer, uint32_t value)
@@ -75,7 +75,7 @@
infilename = argv[1];
in = fopen(infilename, "rb");
if (in == NULL) {
- fprintf(stderr, "unable to open input file '%s'\n",
+ fprintf(stderr, "unable to open input file '%s'\n",
infilename);
exit(2);
}
@@ -106,7 +106,7 @@
/* get the MHDR */
ret = read_uint32(in, &length);
if (length != 28) {
- fprintf(stderr, "warning: MHDR is %d bytes instead of 28\n",
+ fprintf(stderr, "warning: MHDR is %d bytes instead of 28\n",
bytes - 4);
}
/* be slightly permissive on spec breakage */
@@ -172,7 +172,7 @@
fwrite(og.header, 1, og.header_len, out);
fwrite(og.body, 1, og.body_len, out);
}
-
+
ogg_stream_clear(&os);
if (in != stdin) fclose(in);
Modified: experimental/giles/mng/mngplay.c
===================================================================
--- experimental/giles/mng/mngplay.c 2013-05-08 22:46:56 UTC (rev 18938)
+++ experimental/giles/mng/mngplay.c 2013-05-10 21:04:55 UTC (rev 18939)
@@ -17,7 +17,7 @@
Raphael Assenat <raph :at: raphnet.net>
2003/11/26: added command line options to run in alternate color depths.
-
+
*/
#include <stdio.h>
@@ -156,7 +156,7 @@
}
/* no MNG streams in this Ogg file */
- fprintf(stderr, "Couldn't find a MNG stream in Ogg file '%s'\n",
+ fprintf(stderr, "Couldn't find a MNG stream in Ogg file '%s'\n",
mymng->filename);
return MNG_FALSE;
}
@@ -222,7 +222,7 @@
screen = SDL_SetVideoMode(width,height, mymng->sdl_video_depth, SDL_SWSURFACE);
if (screen == NULL) {
- fprintf(stderr, "unable to allocate %dx%d video memory: %s\n",
+ fprintf(stderr, "unable to allocate %dx%d video memory: %s\n",
width, height, SDL_GetError());
return MNG_FALSE;
}
@@ -246,12 +246,12 @@
}
/*
- printf("RGBA Masks: %08X %08X %08X %08X\n",
+ printf("RGBA Masks: %08X %08X %08X %08X\n",
mymng->surface->format->Rmask,
mymng->surface->format->Gmask,
mymng->surface->format->Bmask,
mymng->surface->format->Amask);
- printf("RGBA Shifts: %08X %08X %08X %08X\n",
+ printf("RGBA Shifts: %08X %08X %08X %08X\n",
mymng->surface->format->Rshift,
mymng->surface->format->Gshift,
mymng->surface->format->Bshift,
@@ -331,12 +331,12 @@
/* dereference our structure */
mymng = (mngstuff*)mng_get_userdata(mng);
- /* we assume any necessary locking has happened
+ /* we assume any necessary locking has happened
outside, in the frame level code */
row = mymng->surface->pixels + mymng->surface->pitch*line;
// fprintf(stderr, " returning pointer to line %d (%p)\n", line, row);
-
+
return (row);
}
@@ -499,7 +499,7 @@
/* we have an event; process it */
switch (event.type) {
case SDL_QUIT:
- mymngquit(mng); /* quit */
+ mymngquit(mng); /* quit */
break;
case SDL_MOUSEBUTTONDOWN:
case SDL_MOUSEBUTTONUP:
Modified: experimental/giles/mp3.txt
===================================================================
--- experimental/giles/mp3.txt 2013-05-08 22:46:56 UTC (rev 18938)
+++ experimental/giles/mp3.txt 2013-05-10 21:04:55 UTC (rev 18939)
@@ -19,7 +19,7 @@
O (original/copy flag) 1 = original
EM (emphasis) 00 = none
-bitrate is a 4 bit enum, with a lookup table that varies by version
+bitrate is a 4 bit enum, with a lookup table that varies by version
according to the following table
version: MPEG-1 Layer 1 Layer 2 Layer 3 MPEG-2 LSF Layer 1 Layer 2/3
Modified: experimental/giles/mp3dump.c
===================================================================
--- experimental/giles/mp3dump.c 2013-05-08 22:46:56 UTC (rev 18938)
+++ experimental/giles/mp3dump.c 2013-05-10 21:04:55 UTC (rev 18939)
@@ -20,7 +20,7 @@
static int parse(const unsigned char *p, mp3header *header)
{
- const int bitrates[16] =
+ const int bitrates[16] =
{0, 32000, 40000, 48000, 56000, 64000, 80000, 96000,
112000, 128000, 160000, 192000, 224000, 256000, 320000, 0};
const int samplerates[4] = {44100, 48000, 32000};
@@ -51,7 +51,7 @@
if (header->layer == 1) scale = 48;
else scale = 144;
-
+
size = header->bitrate * scale / header->freq;
/* divide by an extra factor of 2 for MPEG-2? */
@@ -111,7 +111,7 @@
return 0;
}
-
+
static int is_mp3(const unsigned char *p, const unsigned char *e) {
/* do we have enough room to see a 4 byte header? */
if (p > e) return 0;
@@ -178,7 +178,7 @@
if (is_id3(p, e)) {
if (p - q) fprintf(out, "LOST SYNC\n");
skip = 10 + (p[9] | (p[8] << 7) | (p[7] << 14) | (p[6] << 21));
- fprintf(out, " id3 header at 0x%08lx (%ld bytes)\n",
+ fprintf(out, " id3 header at 0x%08lx (%ld bytes)\n",
(long)(p-buf), skip);
p += skip;
hbytes += skip;
@@ -187,7 +187,7 @@
if (p - q) fprintf(out, "LOST SYNC\n");
parse(p, &header);
skip = framesize(&header);
- fprintf(out, " mp3 header at 0x%08lx (%ld bytes)\n",
+ fprintf(out, " mp3 header at 0x%08lx (%ld bytes)\n",
(long)(p-buf), skip);
dump_header(&header, out);
p += skip;
More information about the commits
mailing list