diff options
| author | Diego Biurrun <diego@biurrun.de> | 2007-02-21 10:15:08 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-02-21 10:15:08 +0000 |
| commit | 0afd2a92bd1172b4a7358e410e6f3d261874489e (patch) | |
| tree | b06a77a3df8e706ca2eb545785083f2d59c5dc0a | |
| parent | 0e3b6a6f55eaa060166ab4f02f4d22cfc75d8d27 (diff) | |
cosmetics: Fix a common typo, sepErate --> sepArate.
Originally committed as revision 8047 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/h264.c | 6 | ||||
| -rw-r--r-- | libavcodec/oggvorbis.c | 4 | ||||
| -rw-r--r-- | output_example.c | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 3d79013d21..c66c9c7a17 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1952,8 +1952,8 @@ static inline int get_chroma_qp(int chroma_qp_index_offset, int qscale){ } //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 @@ static inline int quantize_c(DCTELEM *block, uint8_t *scantable, int qscale, int 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; diff --git a/libavcodec/oggvorbis.c b/libavcodec/oggvorbis.c index 9e684a0f49..da97e9a78e 100644 --- a/libavcodec/oggvorbis.c +++ b/libavcodec/oggvorbis.c @@ -159,7 +159,9 @@ static int oggvorbis_encode_frame(AVCodecContext *avccontext, 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); diff --git a/output_example.c b/output_example.c index ee123fdcd4..ca12b783f1 100644 --- a/output_example.c +++ b/output_example.c @@ -220,7 +220,7 @@ static AVStream *add_video_stream(AVFormatContext *oc, int codec_id) 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; |