[Ffmpeg-cvslog] r8047 - in trunk: libavcodec/h264.c libavcodec/oggvorbis.c output_example.c

[diego]

Author: diego
Date: Wed Feb 21 11:15:08 2007
New Revision: 8047

Modified:
   trunk/libavcodec/h264.c
   trunk/libavcodec/oggvorbis.c
   trunk/output_example.c

Log:
cosmetics: Fix a common typo, sepErate --> sepArate.


Modified: trunk/libavcodec/h264.c
==============================================================================
--- trunk/libavcodec/h264.c	(original)
+++ trunk/libavcodec/h264.c	Wed Feb 21 11:15:08 2007
@@ -1952,8 +1952,8 @@
 }
 
 //FIXME need to check that this doesnt overflow signed 32 bit for low qp, i am not sure, it's very close
-//FIXME check that gcc inlines this (and optimizes intra & seperate_dc stuff away)
-static inline int quantize_c(DCTELEM *block, uint8_t *scantable, int qscale, int intra, int seperate_dc){
+//FIXME check that gcc inlines this (and optimizes intra & separate_dc stuff away)
+static inline int quantize_c(DCTELEM *block, uint8_t *scantable, int qscale, int intra, int separate_dc){
     int i;
     const int * const quant_table= quant_coeff[qscale];
     const int bias= intra ? (1<<QUANT_SHIFT)/3 : (1<<QUANT_SHIFT)/6;
@@ -1961,7 +1961,7 @@
     const unsigned int threshold2= (threshold1<<1);
     int last_non_zero;
 
-    if(seperate_dc){
+    if(separate_dc){
         if(qscale<=18){
             //avoid overflows
             const int dc_bias= intra ? (1<<(QUANT_SHIFT-2))/3 : (1<<(QUANT_SHIFT-2))/6;

Modified: trunk/libavcodec/oggvorbis.c
==============================================================================
--- trunk/libavcodec/oggvorbis.c	(original)
+++ trunk/libavcodec/oggvorbis.c	Wed Feb 21 11:15:08 2007
@@ -159,7 +159,9 @@
         vorbis_bitrate_addblock(&context->vb) ;
 
         while(vorbis_bitrate_flushpacket(&context->vd, &op)) {
-            if(op.bytes==1) //id love to say this is a hack, bad sadly its not, appearently the end of stream decission is in libogg
+            /* i'd love to say the following line is a hack, but sadly it's
+             * not, apparently the end of stream decision is in libogg. */
+            if(op.bytes==1)
                 continue;
             memcpy(context->buffer + context->buffer_index, &op, sizeof(ogg_packet));
             context->buffer_index += sizeof(ogg_packet);

Modified: trunk/output_example.c
==============================================================================
--- trunk/output_example.c	(original)
+++ trunk/output_example.c	Wed Feb 21 11:15:08 2007
@@ -220,7 +220,7 @@
            motion of the chroma plane doesnt match the luma plane */
         c->mb_decision=2;
     }
-    // some formats want stream headers to be seperate
+    // some formats want stream headers to be separate
     if(!strcmp(oc->oformat->name, "mp4") || !strcmp(oc->oformat->name, "mov") || !strcmp(oc->oformat->name, "3gp"))
         c->flags |= CODEC_FLAG_GLOBAL_HEADER;