@@ -3682,7 +3682,7 @@ static void opt_output_file(void *optctx, const char *filename)

     }

     if (!(oc->oformat->flags & AVFMT_NOFILE)) {

-        /* test if it already exists to avoid loosing precious files */

+        /* test if it already exists to avoid losing precious files */

         assert_file_overwrite(filename);

         /* open the file */

@@ -475,7 +475,7 @@ static void start_children(FFStream *feed)

                     slash++;

                 strcpy(slash, "avconv");

-                http_log("Launch commandline: ");

+                http_log("Launch command line: ");

                 http_log("%s ", pathname);

                 for (i = 1; feed->child_argv[i] && feed->child_argv[i][0]; i++)

                     http_log("%s ", feed->child_argv[i]);

@@ -83,7 +83,7 @@ int opt_timelimit(const char *opt, const char *arg);

  * parsed or the corresponding value is invalid.

  *

  * @param context the context of the value to be set (e.g. the

- * corresponding commandline option name)

+ * corresponding command line option name)

  * @param numstr the string to be parsed

  * @param type the type (OPT_INT64 or OPT_FLOAT) as which the

  * string should be parsed

@@ -98,7 +98,7 @@ double parse_number_or_die(const char *context, const char *numstr, int type, do

  * the string cannot be correctly parsed.

  *

  * @param context the context of the value to be set (e.g. the

- * corresponding commandline option name)

+ * corresponding command line option name)

  * @param timestr the string to be parsed

  * @param is_duration a flag which tells how to interpret timestr, if

  * not zero timestr is interpreted as a duration, otherwise as a

@@ -181,7 +181,7 @@ void parse_options(void *optctx, int argc, char **argv, const OptionDef *options

 int parse_option(void *optctx, const char *opt, const char *arg, const OptionDef *options);

 /**

- * Find the '-loglevel' option in the commandline args and apply it.

+ * Find the '-loglevel' option in the command line args and apply it.

  */

 void parse_loglevel(int argc, char **argv, const OptionDef *options);

@@ -29,7 +29,7 @@ rates and resize video on the fly with a high quality polyphase filter.

 avconv reads from an arbitrary number of input "files" (which can be regular

 files, pipes, network streams, grabbing devices, etc.), specified by the

 @code{-i} option, and writes to an arbitrary number of output "files", which are

-specified by a plain output filename. Anything found on the commandline which

+specified by a plain output filename. Anything found on the command line which

 cannot be interpreted as an option is considered to be an output filename.

 Each input or output file can in principle contain any number of streams of

@@ -150,7 +150,7 @@ that only captures in stereo and also requires that one channel be flipped.

 If you are one of these people, then export 'AUDIO_FLIP_LEFT=1' before

 starting avconv.

-@subsection The audio and video loose sync after a while.

+@subsection The audio and video lose sync after a while.

 Yes, they do.

@@ -9,7 +9,7 @@ example 'KB', 'MiB', 'G' and 'B' as postfix.

 Options which do not take arguments are boolean options, and set the

 corresponding value to true. They can be set to false by prefixing

 with "no" the option name, for example using "-nofoo" in the

-commandline will set to false the boolean option with name "foo".

+command line will set to false the boolean option with name "foo".

 @section Stream specifiers

 Some options are applied per-stream, e.g. bitrate or codec. Stream specifiers

@@ -49,7 +49,7 @@ mailing list.

 The code is written in K&R C style. That means the following:

 @itemize @bullet

 @item

-The control statements are formatted by putting space betwen the statement

+The control statements are formatted by putting space between the statement

 and parenthesis in the following way:

 @example

 for (i = 0; i < filter->input_count; i++) @{

@@ -79,7 +79,7 @@ if (!pic || !picref)

     goto fail;

 @end example

 @item

-Do not put spaces immediately inside parenthesis. @samp{if (ret)} is

+Do not put spaces immediately inside parentheses. @samp{if (ret)} is

 a valid style; @samp{if ( ret )} is not.

 @end itemize

@@ -1,7 +1,7 @@

 @chapter Expression Evaluation

 @c man begin EXPRESSION EVALUATION

-When evaluating an arithemetic expression, Libav uses an internal

+When evaluating an arithmetic expression, Libav uses an internal

 formula evaluator, implemented through the @file{libavutil/eval.h}

 interface.

@@ -53,7 +53,7 @@ returns the value stored in the internal variable.

 @item ld(var)

 Allow to load the value of the internal variable with number

-@var{var}, which was previosly stored with st(@var{var}, @var{expr}).

+@var{var}, which was previously stored with st(@var{var}, @var{expr}).

 The function returns the loaded value.

 @item while(cond, expr)

@@ -200,7 +200,7 @@ input plane. They are expressions, and can contain the following

 constants:

 @table @option

 @item w, h

-the input width and heigth in pixels

+the input width and height in pixels

 @item cw, ch

 the input chroma image width and height in pixels

@@ -888,7 +888,7 @@ the corresponding mathematical approximated values for e

 (euler number), pi (greek PI), PHI (golden ratio)

 @item w, h

-the input width and heigth

+the input width and height

 @item val

 input value for the pixel component

@@ -992,7 +992,7 @@ The filter takes the parameters: @var{filter_name}@{:=@}@var{filter_params}.

 filter. If not specified the default values are assumed.

 Refer to the official libopencv documentation for more precise

-informations:

+information:

 @url{http://opencv.willowgarage.com/documentation/c/image_filtering.html}

 Follows the list of supported libopencv filters.

@@ -1008,7 +1008,7 @@ It accepts the parameters: @var{struct_el}:@var{nb_iterations}.

 @var{struct_el} represents a structuring element, and has the syntax:

 @var{cols}x@var{rows}+@var{anchor_x}x@var{anchor_y}/@var{shape}

-@var{cols} and @var{rows} represent the number of colums and rows of

+@var{cols} and @var{rows} represent the number of columns and rows of

 the structuring element, @var{anchor_x} and @var{anchor_y} the anchor

 point, and @var{shape} the shape for the structuring element, and

 can be one of the values "rect", "cross", "ellipse", "custom".

@@ -1184,7 +1184,7 @@ value for @var{width} or @var{height} is 0, the corresponding input size

 is used for the output.

 The @var{width} expression can reference the value set by the

-@var{height} expression, and viceversa.

+@var{height} expression, and vice versa.

 The default value of @var{width} and @var{height} is 0.

@@ -1194,7 +1194,7 @@ Specify the offsets where to place the input image in the padded area

 with respect to the top/left border of the output image.

 The @var{x} expression can reference the value set by the @var{y}

-expression, and viceversa.

+expression, and vice versa.

 The default value of @var{x} and @var{y} is 0.

@@ -1608,7 +1608,7 @@ seconds

 @item pos

 position of the frame in the input stream, -1 if this information in

-unavailable and/or meanigless (for example in case of synthetic video)

+unavailable and/or meaningless (for example in case of synthetic video)

 @item fmt

 pixel format name

@@ -1825,7 +1825,7 @@ through the interface defined in @file{libavfilter/vsrc_buffer.h}.

 It accepts the following parameters:

 @var{width}:@var{height}:@var{pix_fmt_string}:@var{timebase_num}:@var{timebase_den}:@var{sample_aspect_ratio_num}:@var{sample_aspect_ratio.den}

-All the parameters need to be explicitely defined.

+All the parameters need to be explicitly defined.

 Follows the list of the accepted parameters.

@@ -2017,7 +2017,7 @@ separated by ":". The description of the accepted options follows.

 @item size, s

 Specify the size of the sourced video, it may be a string of the form

-@var{width}x@var{heigth}, or the name of a size abbreviation. The

+@var{width}x@var{height}, or the name of a size abbreviation. The

 default value is "320x240".

 @item rate, r

@@ -485,7 +485,7 @@ following image formats are supported:

 @item id RoQ video           @tab  X  @tab  X

     @tab Used in Quake III, Jedi Knight 2, other computer games.

 @item IFF ILBM               @tab     @tab  X

-    @tab IFF interlaved bitmap

+    @tab IFF interleaved bitmap

 @item IFF ByteRun1           @tab     @tab  X

     @tab IFF run length encoded bitmap

 @item Intel H.263            @tab     @tab  X

@@ -155,8 +155,8 @@ be seekable, so they will fail with the pipe output protocol.

 Real-Time Messaging Protocol.

-The Real-Time Messaging Protocol (RTMP) is used for streaming multime‐

-dia content across a TCP/IP network.

+The Real-Time Messaging Protocol (RTMP) is used for streaming multimedia

+content across a TCP/IP network.

 The required syntax is:

 @example

@@ -195,7 +195,7 @@ Real-Time Messaging Protocol and its variants supported through

 librtmp.

 Requires the presence of the librtmp headers and library during

-configuration. You need to explicitely configure the build with

+configuration. You need to explicitly configure the build with

 "--enable-librtmp". If enabled this will replace the native RTMP

 protocol.

@@ -18,7 +18,7 @@ essential that changes to their codebase are publicly visible, clean and

 easy reviewable that again leads us to:

 * use of a revision control system like git

 * separation of cosmetic from non-cosmetic changes (this is almost entirely

-  ignored by mentors and students in soc 2006 which might lead to a suprise

+  ignored by mentors and students in soc 2006 which might lead to a surprise

   when the code will be reviewed at the end before a possible inclusion in

   Libav, individual changes were generally not reviewable due to cosmetics).

 * frequent commits, so that comments can be provided early

@@ -3797,7 +3797,7 @@ static void opt_output_file(void *optctx, const char *filename)

     }

     if (!(oc->oformat->flags & AVFMT_NOFILE)) {

-        /* test if it already exists to avoid loosing precious files */

+        /* test if it already exists to avoid losing precious files */

         if (!file_overwrite &&

             (strchr(filename, ':') == NULL ||

              filename[1] == ':' ||

@@ -1274,7 +1274,7 @@ typedef struct AVCodecContext {

      * Some codecs need additional format info. It is stored here.

      * If any muxer uses this then ALL demuxers/parsers AND encoders for the

      * specific codec MUST set it correctly otherwise stream copy breaks.

-     * In general use of this field by muxers is not recommanded.

+     * In general use of this field by muxers is not recommended.

      * - encoding: Set by libavcodec.

      * - decoding: Set by libavcodec. (FIXME: Is this OK?)

      */

@@ -3444,7 +3444,7 @@ typedef struct ReSampleContext ReSampleContext;

  * @param linear           if 1 then the used FIR filter will be linearly interpolated

                            between the 2 closest, if 0 the closest will be used

  * @param cutoff           cutoff frequency, 1.0 corresponds to half the output sampling rate

- * @return allocated ReSampleContext, NULL if error occured

+ * @return allocated ReSampleContext, NULL if error occurred

  */

 ReSampleContext *av_audio_resample_init(int output_channels, int input_channels,

                                         int output_rate, int input_rate,

@@ -103,7 +103,7 @@ static int alloc_table(VLC *vlc, int size, int use_static)

     vlc->table_size += size;

     if (vlc->table_size > vlc->table_allocated) {

         if(use_static)

-            abort(); //cant do anything, init_vlc() is used with too little memory

+            abort(); // cannot do anything, init_vlc() is used with too little memory

         vlc->table_allocated += (1 << vlc->bits);

         vlc->table = av_realloc(vlc->table,

                                 sizeof(VLC_TYPE) * 2 * vlc->table_allocated);

@@ -498,8 +498,8 @@ typedef struct DSPContext {

      * with the zigzag/alternate scan<br>

      * an example to avoid confusion:

      * - (->decode coeffs -> zigzag reorder -> dequant -> reference idct ->...)

-     * - (x -> referece dct -> reference idct -> x)

-     * - (x -> referece dct -> simple_mmx_perm = idct_permutation -> simple_idct_mmx -> x)

+     * - (x -> reference dct -> reference idct -> x)

+     * - (x -> reference dct -> simple_mmx_perm = idct_permutation -> simple_idct_mmx -> x)

      * - (->decode coeffs -> zigzag reorder -> simple_mmx_perm -> dequant -> simple_idct_mmx ->...)

      */

     uint8_t idct_permutation[64];

@@ -155,7 +155,7 @@ static int tgv_decode_inter(TgvContext * s, const uint8_t *buf, const uint8_t *b

     vector_bits       = AV_RL16(&buf[6]);

     buf += 12;

-    /* allocate codebook buffers as neccessary */

+    /* allocate codebook buffers as necessary */

     if (num_mvs > s->num_mvs) {

         s->mv_codebook = av_realloc(s->mv_codebook, num_mvs*2*sizeof(int));

         s->num_mvs = num_mvs;

@@ -286,7 +286,7 @@ static int tgv_decode_frame(AVCodecContext *avctx,

         s->frame.buffer_hints = FF_BUFFER_HINTS_VALID;

         s->frame.linesize[0] = s->width;

-        /* allocate additional 12 bytes to accomodate av_memcpy_backptr() OUTBUF_PADDED optimisation */

+        /* allocate additional 12 bytes to accommodate av_memcpy_backptr() OUTBUF_PADDED optimisation */

         s->frame.data[0] = av_malloc(s->width*s->height + 12);

         if (!s->frame.data[0])

             return AVERROR(ENOMEM);

@@ -790,7 +790,7 @@ void ff_er_frame_end(MpegEncContext *s){

     if(!s->error_recognition || s->error_count==0 || s->avctx->lowres ||

        s->avctx->hwaccel ||

        s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU ||

-       s->picture_structure != PICT_FRAME || // we dont support ER of field pictures yet, though it should not crash if enabled

+       s->picture_structure != PICT_FRAME || // we do not support ER of field pictures yet, though it should not crash if enabled

        s->error_count==3*s->mb_width*(s->avctx->skip_top + s->avctx->skip_bottom)) return;

     if (s->current_picture.f.motion_val[0] == NULL) {

@@ -153,7 +153,7 @@ static int g722_encode_trellis(AVCodecContext *avctx,

         for (j = 0; j < frontier && nodes[0][j]; j++) {

             /* Only k >> 2 affects the future adaptive state, therefore testing

-             * small steps that don't change k >> 2 is useless, the orignal

+             * small steps that don't change k >> 2 is useless, the original

              * value from encode_low is better than them. Since we step k

              * in steps of 4, make sure range is a multiple of 4, so that

              * we don't miss the original value from encode_low. */

@@ -2893,7 +2893,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0){

              * FIXME: avoiding a memcpy would be nice, but ref handling makes many assumptions

              * about there being no actual duplicates.

              * FIXME: this doesn't copy padding for out-of-frame motion vectors.  Given we're

-             * concealing a lost frame, this probably isn't noticable by comparison, but it should

+             * concealing a lost frame, this probably isn't noticeable by comparison, but it should

              * be fixed. */

             if (h->short_ref_count) {

                 if (prev) {

@@ -3316,7 +3316,7 @@ static av_always_inline void fill_filter_caches_inter(H264Context *h, MpegEncCon

 /**

  *

- * @return non zero if the loop filter can be skiped

+ * @return non zero if the loop filter can be skipped

  */

 static int fill_filter_caches(H264Context *h, int mb_type){

     MpegEncContext * const s = &h->s;

@@ -3839,7 +3839,7 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size){

                 av_log(h->s.avctx, AV_LOG_ERROR, "Invalid mix of idr and non-idr slices");

                 return -1;

             }

-            idr(h); //FIXME ensure we don't loose some frames if there is reordering

+            idr(h); // FIXME ensure we don't lose some frames if there is reordering

         case NAL_SLICE:

             init_get_bits(&hx->s.gb, ptr, bit_length);

             hx->intra_gb_ptr=

@@ -340,7 +340,7 @@ FUNC(ff_jpeg_fdct_islow)(DCTELEM *data)

 /*

  * The secret of DCT2-4-8 is really simple -- you do the usual 1-DCT

- * on the rows and then, instead of doing even and odd, part on the colums

+ * on the rows and then, instead of doing even and odd, part on the columns

  * you do even part two times.

  */

 GLOBAL(void)

@@ -67,7 +67,7 @@ typedef struct LPCContext {

      * Perform autocorrelation on input samples with delay of 0 to lag.

      * @param data  input samples.

      *              constraints: no alignment needed, but must have have at

-     *              least lag*sizeof(double) valid bytes preceeding it, and

+     *              least lag*sizeof(double) valid bytes preceding it, and

      *              size must be at least (len+1)*sizeof(double) if data is

      *              16-byte aligned or (len+2)*sizeof(double) if data is

      *              unaligned.

@@ -1109,9 +1109,9 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)

         av_log(s->avctx, AV_LOG_DEBUG, "APPx %8X\n", id);

     }

-    /* buggy AVID, it puts EOI only at every 10th frame */

-    /* also this fourcc is used by non-avid files too, it holds some

-       informations, but it's always present in AVID creates files */

+    /* Buggy AVID, it puts EOI only at every 10th frame. */

+    /* Also, this fourcc is used by non-avid files too, it holds some

+       information, but it's always present in AVID-created files. */

     if (id == AV_RL32("AVI1"))

     {

         /* structure:

@@ -127,7 +127,7 @@ typedef struct Picture{

     int ref_poc[2][2][16];      ///< h264 POCs of the frames used as reference (FIXME need per slice)

     int ref_count[2][2];        ///< number of entries in ref_poc              (FIXME need per slice)

     int mbaff;                  ///< h264 1 -> MBAFF frame 0-> not MBAFF

-    int field_picture;          ///< whether or not the picture was encoded in seperate fields

+    int field_picture;          ///< whether or not the picture was encoded in separate fields

     int mb_var_sum;             ///< sum of MB variance for current frame

     int mc_mb_var_sum;          ///< motion compensated MB variance for current frame

@@ -559,7 +559,7 @@ static int decode_slice(AVCodecContext *avctx, ProresThreadData *td)

     sf = sf > 128 ? (sf - 96) << 2 : sf;

     /* scale quantization matrixes according with slice's scale factor */

-    /* TODO: this can be SIMD-optimized alot */

+    /* TODO: this can be SIMD-optimized a lot */

     if (ctx->qmat_changed || sf != ctx->prev_slice_sf) {

         ctx->prev_slice_sf = sf;

         for (i = 0; i < 64; i++) {

@@ -155,7 +155,7 @@ static av_cold int decode_init(AVCodecContext *avctx)

              return -1;

     }

     c->bpp = avctx->bits_per_coded_sample;

-    // buffer size for RLE 'best' case when 2-byte code preceeds each pixel and there may be padding after it too

+    // buffer size for RLE 'best' case when 2-byte code precedes each pixel and there may be padding after it too

     c->decomp_size = (((avctx->width * c->bpp + 7) >> 3) + 3 * avctx->width + 2) * avctx->height + 2;

     /* Allocate decompression buffer */

@@ -98,7 +98,7 @@ static int vaapi_mpeg4_start_frame(AVCodecContext *avctx, av_unused const uint8_

         pic_param->forward_reference_picture  = ff_vaapi_get_surface_id(&s->last_picture);

     /* Fill in VAIQMatrixBufferMPEG4 */

-    /* Only the first inverse quantisation method uses the weighthing matrices */

+    /* Only the first inverse quantisation method uses the weighting matrices */

     if (pic_param->vol_fields.bits.quant_type) {

         iq_matrix = ff_vaapi_alloc_iq_matrix(vactx, sizeof(VAIQMatrixBufferMPEG4));

         if (!iq_matrix)

@@ -3536,7 +3536,7 @@ static void vc1_apply_p_loop_filter(VC1Context *v)

         vc1_apply_p_v_loop_filter(v, i);

     }

-    /* V always preceedes H, therefore we run H one MB before V;

+    /* V always precedes H, therefore we run H one MB before V;

      * at the end of a row, we catch up to complete the row */

     if (s->mb_x) {

         for (i = 0; i < 6; i++) {

@@ -3573,7 +3573,7 @@ static int vc1_decode_p_mb(VC1Context *v)

     int skipped, fourmv;

     int block_cbp = 0, pat, block_tt = 0, block_intra = 0;

-    mquant = v->pq; /* Loosy initialization */

+    mquant = v->pq; /* lossy initialization */

     if (v->mv_type_is_raw)

         fourmv = get_bits1(gb);

@@ -4141,7 +4141,7 @@ static void vc1_decode_b_mb(VC1Context *v)

     int dmv_x[2], dmv_y[2];

     int bmvtype = BMV_TYPE_BACKWARD;

-    mquant      = v->pq; /* Loosy initialization */

+    mquant      = v->pq; /* lossy initialization */

     s->mb_intra = 0;

     if (v->dmb_is_raw)

@@ -1425,7 +1425,7 @@ static int remaining_bits(WMAProDecodeCtx *s, GetBitContext *gb)

  *@param s codec context

  *@param gb bitstream reader context

  *@param len length of the partial frame

- *@param append decides wether to reset the buffer or not

+ *@param append decides whether to reset the buffer or not

  */

 static void save_bits(WMAProDecodeCtx *s, GetBitContext* gb, int len,

                       int append)

@@ -189,7 +189,7 @@ typedef struct {

      * @{

      */

     int spillover_nbits;          ///< number of bits of the previous packet's

-                                  ///< last superframe preceeding this

+                                  ///< last superframe preceding this

                                   ///< packet's first full superframe (useful

                                   ///< for re-synchronization also)

     int has_residual_lsps;        ///< if set, superframes contain one set of

@@ -1805,7 +1805,7 @@ static int synth_superframe(AVCodecContext *ctx, int *got_frame_ptr)

     s->frame.nb_samples = n_samples;

     samples = (float *)s->frame.data[0];

-    /* Parse frames, optionally preceeded by per-frame (independent) LSPs. */

+    /* Parse frames, optionally preceded by per-frame (independent) LSPs. */

     for (n = 0; n < 3; n++) {

         if (!s->has_residual_lsps) {

             int m;

@@ -227,7 +227,7 @@ section .text

     imul r2, 0x01010101

 %endmacro

-; I dont know why the sign extension is needed...

+; I do not know why the sign extension is needed...

 %macro PSIGNW_SRA_MMX 2

     psraw %2, 15

     PSIGNW_MMX %1, %2

@@ -271,7 +271,7 @@ static int audio_read_packet(AVFormatContext *context, AVPacket *pkt)

         }

     }

-    /* Wait for a packet comming back from process_callback(), if one isn't available yet */

+    /* Wait for a packet coming back from process_callback(), if one isn't available yet */

     timeout.tv_sec = av_gettime() / 1000000 + 2;

     if (sem_timedwait(&self->packet_count, &timeout)) {

         if (errno == ETIMEDOUT) {

@@ -72,7 +72,7 @@ TimeFilter * ff_timefilter_new(double clock_period, double feedback2_factor, dou

  *

  * system_time, in seconds, should be the value of the system clock time,

  * at (or as close as possible to) the moment the device hardware interrupt

- * occured (or any other event the device clock raises at the beginning of a

+ * occurred (or any other event the device clock raises at the beginning of a

  * cycle).

  *

  * @return the filtered time, in seconds

@@ -685,7 +685,8 @@ typedef struct AVStream {

     /**

      * last packet in packet_buffer for this stream when muxing.

-     * used internally, NOT PART OF PUBLIC API, dont read or write from outside of libav*

+     * Used internally, NOT PART OF PUBLIC API, do not read or

+     * write from outside of libav*

      */

     struct AVPacketList *last_in_packet_buffer;

 #endif

@@ -709,7 +710,7 @@ typedef struct AVStream {

     int codec_info_nb_frames;

     /**

-     * Stream informations used internally by av_find_stream_info()

+     * Stream information used internally by av_find_stream_info()

      */

 #define MAX_STD_TIMEBASES (60*12+5)

     struct {

@@ -877,7 +878,7 @@ typedef struct AVFormatContext {

     /**

      * Decoding: duration of the stream, in AV_TIME_BASE fractional

      * seconds. Only set this value if you know none of the individual stream

-     * durations and also dont set any of them. This is deduced from the

+     * durations and also do not set any of them. This is deduced from the

      * AVStream values if not set.

      */

     int64_t duration;

@@ -361,7 +361,7 @@ static int flv_write_trailer(AVFormatContext *s)

     file_size = avio_tell(pb);

-    /* update informations */

+    /* update information */

     avio_seek(pb, flv->duration_offset, SEEK_SET);

     put_amf_double(pb, flv->duration / (double)1000);

     avio_seek(pb, flv->filesize_offset, SEEK_SET);

@@ -412,7 +412,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt)

     }

     if (enc->codec_id == CODEC_ID_H264) {

-        /* check if extradata looks like mp4 formated */

+        /* check if extradata looks like MP4 */

         if (enc->extradata_size > 0 && *(uint8_t*)enc->extradata != 1) {

             if (ff_avc_parse_nal_units_buf(pkt->data, &data, &size) < 0)

                 return -1;

@@ -142,7 +142,7 @@ static void free_geobtag(void *obj)

  * @param maxread Pointer to maximum number of characters to read from the

  * AVIOContext. After execution the value is decremented by the number of bytes

  * actually read.

- * @returns 0 if no error occured, dst is uninitialized on error

+ * @returns 0 if no error occurred, dst is uninitialized on error

  */

 static int decode_str(AVFormatContext *s, AVIOContext *pb, int encoding,

                       uint8_t **dst, int *maxread)

@@ -432,7 +432,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)

                      (!st->codec->extradata_size &&

                       AV_RL32(pkt->data+4) != MKTAG('j','P',' ',' '))){ // signature

             error:

-                av_log(s, AV_LOG_ERROR, "malformated jpeg2000 codestream\n");

+                av_log(s, AV_LOG_ERROR, "malformed JPEG 2000 codestream\n");

                 return -1;

             }

         }

@@ -24,7 +24,7 @@

 static int probe(AVProbeData *p)

 {

-    // the single file i have starts with that, i dont know if others do too

+    // the single file I have starts with that, I do not know if others do, too

     if(   p->buf[0] == 1

        && p->buf[1] == 1

        && p->buf[2] == 3

@@ -33,7 +33,7 @@ typedef struct {

     /** Buffer for outgoing packets. */

     /*@{*/

-    uint8_t *write_out_ptr;              ///< Pointer for writting the buffer.

+    uint8_t *write_out_ptr;              ///< Pointer for writing the buffer.

     uint8_t out_buffer[512];            ///< Buffer for outgoing packet.

     /*@}*/

@@ -243,7 +243,7 @@ static int mov_write_ac3_tag(AVIOContext *pb, MOVTrack *track)

 /**

  * This function writes extradata "as is".

- * Extradata must be formated like a valid atom (with size and tag)

+ * Extradata must be formatted like a valid atom (with size and tag).

  */

 static int mov_write_extradata_tag(AVIOContext *pb, MOVTrack *track)

 {

@@ -456,7 +456,7 @@ static inline int get16(const uint8_t **pp, const uint8_t *p_end)

     return c;

 }

-/* read and allocate a DVB string preceeded by its length */

+/* read and allocate a DVB string preceded by its length */

 static char *getstr8(const uint8_t **pp, const uint8_t *p_end)

 {

     int len;

@@ -1672,7 +1672,7 @@ static int handle_packet(MpegTSContext *ts, const uint8_t *packet)

         return 0;

     p = packet + 4;

     if (has_adaptation) {

-        /* skip adapation field */

+        /* skip adaptation field */

         p += p[0] + 1;

     }

     /* if past the end of packet, ignore */

@@ -1750,7 +1750,7 @@ static int read_packet(AVFormatContext *s, uint8_t *buf, int raw_packet_size)

         len = avio_read(pb, buf, TS_PACKET_SIZE);

         if (len != TS_PACKET_SIZE)

             return len < 0 ? len : AVERROR_EOF;

-        /* check paquet sync byte */

+        /* check packet sync byte */

         if (buf[0] != 0x47) {

             /* find a new packet start */

             avio_seek(pb, -TS_PACKET_SIZE, SEEK_CUR);

@@ -1892,7 +1892,7 @@ static int mpegts_read_header(AVFormatContext *s,

     if (s->iformat == &ff_mpegts_demuxer) {

         /* normal demux */

-        /* first do a scaning to get all the services */

+        /* first do a scan to get all the services */

         if (pb->seekable && avio_seek(pb, pos, SEEK_SET) < 0)

             av_log(s, AV_LOG_ERROR, "Unable to seek back to the start\n");

@@ -944,7 +944,7 @@ static int mpegts_write_packet(AVFormatContext *s, AVPacket *pkt)

         uint32_t state = -1;

         if (pkt->size < 5 || AV_RB32(pkt->data) != 0x0000001) {

-            av_log(s, AV_LOG_ERROR, "h264 bitstream malformated, "

+            av_log(s, AV_LOG_ERROR, "H.264 bitstream malformed, "

                    "no startcode found, use -vbsf h264_mp4toannexb\n");

             return -1;

         }

@@ -68,7 +68,7 @@ typedef struct {

     int index;               ///< index in mxf_essence_container_uls table

     const UID *codec_ul;

     int order;               ///< interleaving order if dts are equal

-    int interlaced;          ///< wether picture is interlaced

+    int interlaced;          ///< whether picture is interlaced

     int temporal_reordering;

     AVRational aspect_ratio; ///< display aspect ratio

     int closed_gop;          ///< gop is closed, used in mpeg-2 frame parsing

@@ -484,7 +484,7 @@ real_parse_asm_rulebook(AVFormatContext *s, AVStream *orig_st,

      * is set and once for if it isn't. We only read the first because we

      * don't care much (that's what the "odd" variable is for).

      * Each rule contains a set of one or more statements, optionally

-     * preceeded by a single condition. If there's a condition, the rule

+     * preceded by a single condition. If there's a condition, the rule

      * starts with a '#'. Multiple conditions are merged between brackets,

      * so there are never multiple conditions spread out over separate

      * statements. Generally, these conditions are bitrate limits (min/max)

@@ -72,7 +72,7 @@ enum CodecID ff_rtp_codec_id(const char *buf, enum AVMediaType codec_type);

 #define RTP_VERSION 2

 #define RTP_MAX_SDES 256   /**< maximum text length for SDES */

-/* RTCP paquets use 0.5 % of the bandwidth */

+/* RTCP packets use 0.5% of the bandwidth */

 #define RTCP_TX_RATIO_NUM 5

 #define RTCP_TX_RATIO_DEN 1000

@@ -372,7 +372,7 @@ static int udp_open(URLContext *h, const char *uri, int flags)

         goto fail;

     /* Follow the requested reuse option, unless it's multicast in which

-     * case enable reuse unless explicitely disabled.

+     * case enable reuse unless explicitly disabled.

      */

     if (s->reuse_socket || (s->is_multicast && !reuse_specified)) {

         s->reuse_socket = 1;

@@ -770,7 +770,7 @@ int av_read_packet(AVFormatContext *s, AVPacket *pkt)

             memset(pd->buf+pd->buf_size, 0, AVPROBE_PADDING_SIZE);

             if(av_log2(pd->buf_size) != av_log2(pd->buf_size - pkt->size)){

-                //FIXME we dont reduce score to 0 for the case of running out of buffer space in bytes

+                //FIXME we do not reduce score to 0 for the case of running out of buffer space in bytes

                 set_codec_from_probe_data(s, st, pd, st->probe_packets > 0 ? AVPROBE_SCORE_MAX/4 : 0);

                 if(st->codec->codec_id != CODEC_ID_PROBE){

                     pd->buf_size=0;

@@ -1081,7 +1081,7 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st,

             FFSWAP(int64_t, st->pts_buffer[i], st->pts_buffer[i+1]);

         if(pkt->dts == AV_NOPTS_VALUE)

             pkt->dts= st->pts_buffer[0];

-        if(st->codec->codec_id == CODEC_ID_H264){ //we skiped it above so we try here

+        if(st->codec->codec_id == CODEC_ID_H264){ // we skipped it above so we try here

             update_initial_timestamps(s, pkt->stream_index, pkt->dts, pkt->pts); // this should happen on the first packet

         }

         if(pkt->dts > st->cur_dts)

@@ -58,7 +58,7 @@ int av_expr_parse_and_eval(double *res, const char *s,

  * Parse an expression.

  *

  * @param expr a pointer where is put an AVExpr containing the parsed

- * value in case of successfull parsing, or NULL otherwise.

+ * value in case of successful parsing, or NULL otherwise.

  * The pointed to AVExpr must be freed with av_expr_free() by the user

  * when it is not needed anymore.

  * @param s expression as a zero terminated string, for example "1+2^3+5*5+sin(2/3)"

@@ -909,7 +909,7 @@ static void reallocBuffers(PPContext *c, int width, int height, int stride, int

             c->yHistogram[i]= width*height/64*15/256;

     for(i=0; i<3; i++){

-        //Note: The +17*1024 is just there so i do not have to worry about r/w over the end.

+        //Note: The +17*1024 is just there so I do not have to worry about r/w over the end.

         reallocAlign((void **)&c->tempBlurred[i], 8, stride*mbHeight*16 + 17*1024);

         reallocAlign((void **)&c->tempBlurredPast[i], 8, 256*((height+7)&(~7))/2 + 17*1024);//FIXME size

     }

@@ -100,7 +100,7 @@ typedef struct PPMode{

     int minAllowedY;                ///< for brigtness correction

     int maxAllowedY;                ///< for brihtness correction

-    float maxClippedThreshold;      ///< amount of "black" u r willing to loose to get a brightness corrected picture

+    float maxClippedThreshold;      ///< amount of "black" you are willing to lose to get a brightness-corrected picture

     int maxTmpNoise[3];             ///< for Temporal Noise Reducing filter (Maximal sum of abs differences)

@@ -67,7 +67,7 @@ $EGREP $OPT '^\+ *(const *|)static' $*| $EGREP --color=always '[^=]= *(0|NULL)[^

 cat $TMP

 hiegrep '# *ifdef * (HAVE|CONFIG)_' 'ifdefs that should be #if' $*

-hiegrep '\b(awnser|cant|dont|quantised|quantisation|teh|wont)\b' 'common typos' $*

+hiegrep '\b(awnser|cant|dont|wont|usefull|successfull|occured|teh|alot|wether|skiped|heigth|informations|colums|loosy|loosing|seperate|preceed)\b' 'common typos' $*

 hiegrep 'av_log\( *NULL' 'Missing context in av_log' $*

 hiegrep '[^sn]printf' 'Please use av_log' $*