Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

silly typo fixes

Browse Source
pull/16/head
Diego Biurrun 13 years ago
parent 4a7af92cc8
commit a5f8873620
14 changed files with 21 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      doc/protocols.texi
  2. 3
      libavcodec/aacpsy.c
  3. 2
      libavcodec/flac_parser.c
  4. 2
      libavcodec/flacenc.c
  5. 2
      libavcodec/flicvideo.c
  6. 2
      libavcodec/wmavoice.c
  7. 2
      libavcodec/x86/fpel_mmx.c
  8. 2
      libavdevice/v4l2.c
  9. 6
      libavformat/avformat.h
  10. 2
      libavformat/idcin.c
  11. 2
      libavformat/pmpdec.c
  12. 6
      libavformat/utils.c
  13. 6
      libavformat/wavdec.c
  14. 2
      tools/patcheck

2
doc/protocols.texi
Unescape View File

@ -564,7 +564,7 @@ The required syntax for a UDP url is:
udp://@var{hostname}:@var{port}[?@var{options}] udp://@var{hostname}:@var{port}[?@var{options}]
@end example @end example
@var{options} contains a list of &-seperated options of the form @var{key}=@var{val}. @var{options} contains a list of &-separated options of the form @var{key}=@var{val}.
Follow the list of supported options. Follow the list of supported options.
@table @option @table @option

3
libavcodec/aacpsy.c
Unescape View File

@ -804,7 +804,8 @@ static FFPsyWindowInfo psy_lame_window(FFPsyContext *ctx, const float *audio,
sum1 += psy_fir_coeffs[j] * (firbuf[i + j] + firbuf[i + PSY_LAME_FIR_LEN - j]); sum1 += psy_fir_coeffs[j] * (firbuf[i + j] + firbuf[i + PSY_LAME_FIR_LEN - j]);
sum2 += psy_fir_coeffs[j + 1] * (firbuf[i + j + 1] + firbuf[i + PSY_LAME_FIR_LEN - j - 1]); sum2 += psy_fir_coeffs[j + 1] * (firbuf[i + j + 1] + firbuf[i + PSY_LAME_FIR_LEN - j - 1]);
} }
/* NOTE: The LAME psymodel expects it's input in the range -32768 to 32768. Tuning this for normalized floats would be difficult. */ /* NOTE: The LAME psymodel expects its input in the range -32768 to
* 32768. Tuning this for normalized floats would be difficult. */
hpfsmpl[i] = (sum1 + sum2) * 32768.0f; hpfsmpl[i] = (sum1 + sum2) * 32768.0f;
} }

2
libavcodec/flac_parser.c
Unescape View File

@ -27,7 +27,7 @@
* Each time it finds and verifies a CRC-8 header it sees which of the * Each time it finds and verifies a CRC-8 header it sees which of the
* FLAC_MAX_SEQUENTIAL_HEADERS that came before it have a valid CRC-16 footer * FLAC_MAX_SEQUENTIAL_HEADERS that came before it have a valid CRC-16 footer
* that ends at the newly found header. * that ends at the newly found header.
* Headers are scored by FLAC_HEADER_BASE_SCORE plus the max of it's crc-verified * Headers are scored by FLAC_HEADER_BASE_SCORE plus the max of its crc-verified
* children, penalized by changes in sample rate, frame number, etc. * children, penalized by changes in sample rate, frame number, etc.
* The parser returns the frame with the highest score. * The parser returns the frame with the highest score.
**/ **/

2
libavcodec/flacenc.c
Unescape View File

@ -1232,7 +1232,7 @@ static int flac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
frame_bytes = encode_frame(s); frame_bytes = encode_frame(s);
/* fallback to verbatim mode if the compressed frame is larger than it /* Fall back on verbatim mode if the compressed frame is larger than it
would be if encoded uncompressed. */ would be if encoded uncompressed. */
if (frame_bytes < 0 || frame_bytes > s->max_framesize) { if (frame_bytes < 0 || frame_bytes > s->max_framesize) {
s->frame.verbatim_only = 1; s->frame.verbatim_only = 1;

2
libavcodec/flicvideo.c
Unescape View File

@ -539,7 +539,7 @@ static int flic_decode_frame_15_16BPP(AVCodecContext *avctx,
break; break;
case FLI_LC: case FLI_LC:
av_log(avctx, AV_LOG_ERROR, "Unexpected FLI_LC chunk in non-paletised FLC\n"); av_log(avctx, AV_LOG_ERROR, "Unexpected FLI_LC chunk in non-palettized FLC\n");
bytestream2_skip(&g2, chunk_size - 6); bytestream2_skip(&g2, chunk_size - 6);
break; break;

2
libavcodec/wmavoice.c
Unescape View File

@ -607,7 +607,7 @@ static void calc_input_response(WMAVoiceContext *s, float *lpcs,
/* 70.57 =~ 1/log10(1.0331663) */ /* 70.57 =~ 1/log10(1.0331663) */
idx = (pwr * gain_mul - 0.0295) * 70.570526123; idx = (pwr * gain_mul - 0.0295) * 70.570526123;
if (idx > 127) { // fallback if index falls outside table range if (idx > 127) { // fall back if index falls outside table range
coeffs[n] = wmavoice_energy_table[127] * coeffs[n] = wmavoice_energy_table[127] *
powf(1.0331663, idx - 127); powf(1.0331663, idx - 127);
} else } else

2
libavcodec/x86/fpel_mmx.c
Unescape View File

@ -29,7 +29,7 @@
#if HAVE_MMX_INLINE #if HAVE_MMX_INLINE
// in case more speed is needed - unroling would certainly help // in case more speed is needed - unrolling would certainly help
void ff_avg_pixels8_mmx(uint8_t *block, const uint8_t *pixels, void ff_avg_pixels8_mmx(uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h) ptrdiff_t line_size, int h)
{ {

2
libavdevice/v4l2.c
Unescape View File

@ -485,7 +485,7 @@ static int mmap_read_frame(AVFormatContext *ctx, AVPacket *pkt)
/* Image is at s->buff_start[buf.index] */ /* Image is at s->buff_start[buf.index] */
if (avpriv_atomic_int_get(&s->buffers_queued) == FFMAX(s->buffers / 8, 1)) { if (avpriv_atomic_int_get(&s->buffers_queued) == FFMAX(s->buffers / 8, 1)) {
/* when we start getting low on queued buffers, fallback to copying data */ /* when we start getting low on queued buffers, fall back on copying data */
res = av_new_packet(pkt, buf.bytesused); res = av_new_packet(pkt, buf.bytesused);
if (res < 0) { if (res < 0) {
av_log(ctx, AV_LOG_ERROR, "Error allocating a packet.\n"); av_log(ctx, AV_LOG_ERROR, "Error allocating a packet.\n");

6
libavformat/avformat.h
Unescape View File

@ -353,8 +353,8 @@ typedef struct AVProbeData {
#define AVFMT_VARIABLE_FPS 0x0400 /**< Format allows variable fps. */ #define AVFMT_VARIABLE_FPS 0x0400 /**< Format allows variable fps. */
#define AVFMT_NODIMENSIONS 0x0800 /**< Format does not need width/height */ #define AVFMT_NODIMENSIONS 0x0800 /**< Format does not need width/height */
#define AVFMT_NOSTREAMS 0x1000 /**< Format does not require any streams */ #define AVFMT_NOSTREAMS 0x1000 /**< Format does not require any streams */
#define AVFMT_NOBINSEARCH 0x2000 /**< Format does not allow to fallback to binary search via read_timestamp */ #define AVFMT_NOBINSEARCH 0x2000 /**< Format does not allow to fall back on binary search via read_timestamp */
#define AVFMT_NOGENSEARCH 0x4000 /**< Format does not allow to fallback to generic search */ #define AVFMT_NOGENSEARCH 0x4000 /**< Format does not allow to fall back on generic search */
#define AVFMT_NO_BYTE_SEEK 0x8000 /**< Format does not allow seeking by bytes */ #define AVFMT_NO_BYTE_SEEK 0x8000 /**< Format does not allow seeking by bytes */
#define AVFMT_ALLOW_FLUSH 0x10000 /**< Format allows flushing. If not set, the muxer will not receive a NULL packet in the write_packet function. */ #define AVFMT_ALLOW_FLUSH 0x10000 /**< Format allows flushing. If not set, the muxer will not receive a NULL packet in the write_packet function. */
#define AVFMT_TS_NONSTRICT 0x20000 /**< Format does not require strictly #define AVFMT_TS_NONSTRICT 0x20000 /**< Format does not require strictly
@ -1388,7 +1388,7 @@ void avformat_close_input(AVFormatContext **s);
* *
* @param s Media file handle, must be allocated with avformat_alloc_context(). * @param s Media file handle, must be allocated with avformat_alloc_context().
* Its oformat field must be set to the desired output format; * Its oformat field must be set to the desired output format;
* Its pb field must be set to an already openened AVIOContext. * Its pb field must be set to an already opened AVIOContext.
* @param options An AVDictionary filled with AVFormatContext and muxer-private options. * @param options An AVDictionary filled with AVFormatContext and muxer-private options.
* On return this parameter will be destroyed and replaced with a dict containing * On return this parameter will be destroyed and replaced with a dict containing
* options that were not found. May be NULL. * options that were not found. May be NULL.

2
libavformat/idcin.c
Unescape View File

@ -136,7 +136,7 @@ static int idcin_probe(AVProbeData *p)
if (number > 2) if (number > 2)
return 0; return 0;
/* return half certainly since this check is a bit sketchy */ /* return half certainty since this check is a bit sketchy */
return AVPROBE_SCORE_MAX / 2; return AVPROBE_SCORE_MAX / 2;
} }

2
libavformat/pmpdec.c
Unescape View File

@ -157,7 +157,7 @@ static int pmp_seek(AVFormatContext *s, int stream_idx, int64_t ts, int flags)
{ {
PMPContext *pmp = s->priv_data; PMPContext *pmp = s->priv_data;
pmp->cur_stream = 0; pmp->cur_stream = 0;
// fallback to default seek now // fall back on default seek now
return -1; return -1;
} }

6
libavformat/utils.c
Unescape View File

@ -722,7 +722,7 @@ int ff_get_audio_frame_size(AVCodecContext *enc, int size, int mux)
if ((frame_size = av_get_audio_frame_duration(enc, size)) > 0) if ((frame_size = av_get_audio_frame_duration(enc, size)) > 0)
return frame_size; return frame_size;
/* fallback to using frame_size if muxing */ /* Fall back on using frame_size if muxing. */
if (enc->frame_size > 1) if (enc->frame_size > 1)
return enc->frame_size; return enc->frame_size;
@ -1790,8 +1790,8 @@ int avformat_seek_file(AVFormatContext *s, int stream_index, int64_t min_ts, int
//try to seek via read_timestamp() //try to seek via read_timestamp()
} }
//Fallback to old API if new is not implemented but old is // Fall back on old API if new is not implemented but old is.
//Note the old has somewat different sematics // Note the old API has somewhat different semantics.
if(s->iformat->read_seek || 1) if(s->iformat->read_seek || 1)
return av_seek_frame(s, stream_index, ts, flags | ((uint64_t)ts - min_ts > (uint64_t)max_ts - ts ? AVSEEK_FLAG_BACKWARD : 0)); return av_seek_frame(s, stream_index, ts, flags | ((uint64_t)ts - min_ts > (uint64_t)max_ts - ts ? AVSEEK_FLAG_BACKWARD : 0));

6
libavformat/wavdec.c
Unescape View File

@ -73,9 +73,9 @@ static int wav_probe(AVProbeData *p)
return 0; return 0;
if (!memcmp(p->buf + 8, "WAVE", 4)) { if (!memcmp(p->buf + 8, "WAVE", 4)) {
if (!memcmp(p->buf, "RIFF", 4)) if (!memcmp(p->buf, "RIFF", 4))
/* Since ACT demuxer has standard WAV header at top of it's /* Since the ACT demuxer has a standard WAV header at the top of
* own, returning score is decreased to avoid probe conflict * its own, the returned score is decreased to avoid a probe
* between ACT and WAV. */ * conflict between ACT and WAV. */
return AVPROBE_SCORE_MAX - 1; return AVPROBE_SCORE_MAX - 1;
else if (!memcmp(p->buf, "RF64", 4) && else if (!memcmp(p->buf, "RF64", 4) &&
!memcmp(p->buf + 12, "ds64", 4)) !memcmp(p->buf + 12, "ds64", 4))

2
tools/patcheck
Unescape View File

@ -67,7 +67,7 @@ $EGREP $OPT '^\+ *(const *|)static' $*| $EGREP --color=always '[^=]= *(0|NULL)[^
cat $TMP cat $TMP
hiegrep '# *ifdef * (HAVE|CONFIG)_' 'ifdefs that should be #if' $* hiegrep '# *ifdef * (HAVE|CONFIG)_' 'ifdefs that should be #if' $*
hiegrep '\b(awnser|cant|dont|wont|usefull|successfull|occured|teh|alot|wether|skiped|heigth|informations|colums|loosy|loosing|seperate|preceed|upto|paket|posible|unkown|inpossible|dimention|acheive)\b' 'common typos' $* hiegrep '\b(awnser|cant|dont|wont|doesnt|usefull|successfull|occured|teh|alot|wether|skiped|heigth|informations|colums|loosy|loosing|seperate|preceed|upto|paket|posible|unkown|inpossible|dimention|acheive)\b' 'common typos' $*
hiegrep 'av_log\( *NULL' 'Missing context in av_log' $* hiegrep 'av_log\( *NULL' 'Missing context in av_log' $*
hiegrep '[^sn]printf' 'Please use av_log' $* hiegrep '[^sn]printf' 'Please use av_log' $*

Write Preview
Loading…
Cancel
Save