spelling cosmetics

Originally committed as revision 15518 to svn://svn.ffmpeg.org/ffmpeg/trunk

4 files changed, 15 insertions, 15 deletions

diff --git a/libavformat/dv.c b/libavformat/dv.c
index 815caf866d..22d359b031 100644
--- a/libavformat/dv.c
+++ b/libavformat/dv.c
@@ -112,7 +112,7 @@ static int dv_extract_audio(uint8_t* frame, uint8_t* ppcm[4],
         return 0;
 
     smpls = as_pack[1] & 0x3f; /* samples in this frame - min. samples */
-    freq = (as_pack[4] >> 3) & 0x07; /* 0 - 48KHz, 1 - 44,1kHz, 2 - 32 kHz */
+    freq = (as_pack[4] >> 3) & 0x07; /* 0 - 48kHz, 1 - 44,1kHz, 2 - 32kHz */
     quant = as_pack[4] & 0x07; /* 0 - 16bit linear, 1 - 12bit nonlinear */
 
     if (quant > 1)
@@ -145,8 +145,8 @@ static int dv_extract_audio(uint8_t* frame, uint8_t* ppcm[4],
                         if (of*2 >= size)
                             continue;
 
-                        pcm[of*2] = frame[d+1]; // FIXME: may be we have to admit
-                        pcm[of*2+1] = frame[d]; //        that DV is a big endian PCM
+                        pcm[of*2]   = frame[d+1]; // FIXME: maybe we have to admit
+                        pcm[of*2+1] = frame[d];   //        that DV is a big-endian PCM
                         if (pcm[of*2+1] == 0x80 && pcm[of*2] == 0x00)
                             pcm[of*2+1] = 0;
                     } else {           /* 12bit quantization */
@@ -161,12 +161,12 @@ static int dv_extract_audio(uint8_t* frame, uint8_t* ppcm[4],
                         if (of*2 >= size)
                             continue;
 
-                        pcm[of*2] = lc & 0xff; // FIXME: may be we have to admit
-                        pcm[of*2+1] = lc >> 8; //        that DV is a big endian PCM
+                        pcm[of*2]   = lc & 0xff; // FIXME: maybe we have to admit
+                        pcm[of*2+1] = lc >> 8;   //        that DV is a big-endian PCM
                         of = sys->audio_shuffle[i%half_ch+half_ch][j] +
                             (d - 8)/3 * sys->audio_stride;
-                        pcm[of*2] = rc & 0xff; // FIXME: may be we have to admit
-                        pcm[of*2+1] = rc >> 8; //        that DV is a big endian PCM
+                        pcm[of*2]   = rc & 0xff; // FIXME: maybe we have to admit
+                        pcm[of*2+1] = rc >> 8;   //        that DV is a big-endian PCM
                         ++d;
                     }
                 }
@@ -196,7 +196,7 @@ static int dv_extract_audio_info(DVDemuxContext* c, uint8_t* frame)
     }
 
     smpls = as_pack[1] & 0x3f; /* samples in this frame - min. samples */
-    freq = (as_pack[4] >> 3) & 0x07; /* 0 - 48KHz, 1 - 44,1kHz, 2 - 32 kHz */
+    freq = (as_pack[4] >> 3) & 0x07; /* 0 - 48kHz, 1 - 44,1kHz, 2 - 32kHz */
     stype = (as_pack[3] & 0x1f); /* 0 - 2CH, 2 - 4CH, 3 - 8CH */
     quant = as_pack[4] & 0x07; /* 0 - 16bit linear, 1 - 12bit nonlinear */
 
diff --git a/libavformat/dvenc.c b/libavformat/dvenc.c
index 7edd7a842b..468fed3112 100644
--- a/libavformat/dvenc.c
+++ b/libavformat/dvenc.c
@@ -38,7 +38,7 @@ struct DVMuxContext {
     const DVprofile*  sys;    /* Current DV profile. E.g.: 525/60, 625/50 */
     int         n_ast;        /* Number of stereo audio streams (up to 2) */
     AVStream   *ast[2];       /* Stereo audio streams */
-    AVFifoBuffer  audio_data[2]; /* Fifo for storing excessive amounts of PCM */
+    AVFifoBuffer  audio_data[2]; /* FIFO for storing excessive amounts of PCM */
     int         frames;       /* Number of a current frame */
     time_t      start_time;   /* Start time of recording */
     int         has_audio;    /* frame under contruction has audio */
@@ -117,7 +117,7 @@ static int dv_write_pack(enum dv_pack_type pack_id, DVMuxContext *c, uint8_t* bu
                  (c->sys->n_difchan & 2); /* definition: 0 -- 25Mbps, 2 -- 50Mbps */
         buf[4] = (1 << 7) | /* emphasis: 1 -- off */
                  (0 << 6) | /* emphasis time constant: 0 -- reserved */
-                 (0 << 3) | /* frequency: 0 -- 48Khz, 1 -- 44,1Khz, 2 -- 32Khz */
+                 (0 << 3) | /* frequency: 0 -- 48kHz, 1 -- 44,1kHz, 2 -- 32kHz */
                   0;        /* quantization: 0 -- 16bit linear, 1 -- 12bit nonlinear */
         va_end(ap);
         break;
@@ -189,8 +189,8 @@ static void dv_inject_audio(DVMuxContext *c, int channel, uint8_t* frame_ptr)
                 if (of*2 >= size)
                     continue;
 
-                frame_ptr[d] = av_fifo_peek(&c->audio_data[channel], of*2+1); // FIXME: may be we have to admit
-                frame_ptr[d+1] = av_fifo_peek(&c->audio_data[channel], of*2); //        that DV is a big endian PCM
+                frame_ptr[d]   = av_fifo_peek(&c->audio_data[channel], of*2+1); // FIXME: maybe we have to admit
+                frame_ptr[d+1] = av_fifo_peek(&c->audio_data[channel], of*2);   //        that DV is a big-endian PCM
             }
             frame_ptr += 16 * 80; /* 15 Video DIFs + 1 Audio DIF */
         }
@@ -365,7 +365,7 @@ static int dv_write_header(AVFormatContext *s)
     if (!dv_init_mux(s)) {
         av_log(s, AV_LOG_ERROR, "Can't initialize DV format!\n"
                     "Make sure that you supply exactly two streams:\n"
-                    "     video: 25fps or 29.97fps, audio: 2ch/48Khz/PCM\n"
+                    "     video: 25fps or 29.97fps, audio: 2ch/48kHz/PCM\n"
                     "     (50Mbps allows an optional second audio stream)\n");
         return -1;
     }
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 9f41d396a9..48aca43d46 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -1201,7 +1201,7 @@ static int mpegts_probe(AVProbeData *p)
 #endif
 }
 
-/* return the 90 kHz PCR and the extension for the 27 MHz PCR. return
+/* return the 90kHz PCR and the extension for the 27MHz PCR. return
    (-1) if not available */
 static int parse_pcr(int64_t *ppcr_high, int *ppcr_low,
                      const uint8_t *packet)
diff --git a/libavformat/rtp_mpv.c b/libavformat/rtp_mpv.c
index 2c67f058a0..59d8c181a2 100644
--- a/libavformat/rtp_mpv.c
+++ b/libavformat/rtp_mpv.c
@@ -104,7 +104,7 @@ void ff_rtp_send_mpegvideo(AVFormatContext *s1, const uint8_t *buf1, int size)
         memcpy(q, buf1, len);
         q += len;
 
-        /* 90 KHz time stamp */
+        /* 90kHz time stamp */
         s->timestamp = s->cur_timestamp;
         ff_rtp_send_data(s1, s->buf, q - s->buf, (len == size));