Browse code

Fix 'heigth' vs. 'height' typos.

Diego Biurrun authored on 2011/10/05 18:12:01
Showing 3 changed files
... ...
@@ -204,13 +204,13 @@ the computed values for @var{x} and @var{y}. They are evaluated for
204 204
 each new frame.
205 205
 
206 206
 @item in_w, in_h
207
-the input width and heigth
207
+the input width and height
208 208
 
209 209
 @item iw, ih
210 210
 same as @var{in_w} and @var{in_h}
211 211
 
212 212
 @item out_w, out_h
213
-the output (cropped) width and heigth
213
+the output (cropped) width and height
214 214
 
215 215
 @item ow, oh
216 216
 same as @var{out_w} and @var{out_h}
... ...
@@ -895,13 +895,13 @@ the corresponding mathematical approximated values for e
895 895
 (euler number), pi (greek PI), phi (golden ratio)
896 896
 
897 897
 @item in_w, in_h
898
-the input video width and heigth
898
+the input video width and height
899 899
 
900 900
 @item iw, ih
901 901
 same as @var{in_w} and @var{in_h}
902 902
 
903 903
 @item out_w, out_h
904
-the output width and heigth, that is the size of the padded area as
904
+the output width and height, that is the size of the padded area as
905 905
 specified by the @var{width} and @var{height} expressions
906 906
 
907 907
 @item ow, oh
... ...
@@ -1002,13 +1002,13 @@ the corresponding mathematical approximated values for e
1002 1002
 (euler number), pi (greek PI), phi (golden ratio)
1003 1003
 
1004 1004
 @item in_w, in_h
1005
-the input width and heigth
1005
+the input width and height
1006 1006
 
1007 1007
 @item iw, ih
1008 1008
 same as @var{in_w} and @var{in_h}
1009 1009
 
1010 1010
 @item out_w, out_h
1011
-the output (cropped) width and heigth
1011
+the output (cropped) width and height
1012 1012
 
1013 1013
 @item ow, oh
1014 1014
 same as @var{out_w} and @var{out_h}
... ...
@@ -1626,7 +1626,7 @@ alpha specifier. The default value is "black".
1626 1626
 
1627 1627
 @item frame_size
1628 1628
 Specify the size of the sourced video, it may be a string of the form
1629
-@var{width}x@var{heigth}, or the name of a size abbreviation. The
1629
+@var{width}x@var{height}, or the name of a size abbreviation. The
1630 1630
 default value is "320x240".
1631 1631
 
1632 1632
 @item frame_rate
... ...
@@ -115,7 +115,7 @@ static int dnxhd_decode_header(DNXHDContext *ctx, const uint8_t *buf, int buf_si
115 115
     ctx->height = AV_RB16(buf + 0x18);
116 116
     ctx->width  = AV_RB16(buf + 0x1a);
117 117
 
118
-    av_dlog(ctx->avctx, "width %d, heigth %d\n", ctx->width, ctx->height);
118
+    av_dlog(ctx->avctx, "width %d, height %d\n", ctx->width, ctx->height);
119 119
 
120 120
     if (buf[0x21] & 0x40) {
121 121
         ctx->avctx->pix_fmt = PIX_FMT_YUV422P10;
... ...
@@ -84,7 +84,7 @@ typedef struct {
84 84
     int64_t time_frame;      ///< time for the next frame to output (in 1/1000000 units)
85 85
 
86 86
     int fd;                  ///< framebuffer device file descriptor
87
-    int width, heigth;       ///< assumed frame resolution
87
+    int width, height;       ///< assumed frame resolution
88 88
     int frame_linesize;      ///< linesize of the output frame, it is assumed to be constant
89 89
     int bytes_per_pixel;
90 90
 
... ...
@@ -147,10 +147,10 @@ av_cold static int fbdev_read_header(AVFormatContext *avctx,
147 147
     }
148 148
 
149 149
     fbdev->width           = fbdev->varinfo.xres;
150
-    fbdev->heigth          = fbdev->varinfo.yres;
150
+    fbdev->height          = fbdev->varinfo.yres;
151 151
     fbdev->bytes_per_pixel = (fbdev->varinfo.bits_per_pixel + 7) >> 3;
152 152
     fbdev->frame_linesize  = fbdev->width * fbdev->bytes_per_pixel;
153
-    fbdev->frame_size      = fbdev->frame_linesize * fbdev->heigth;
153
+    fbdev->frame_size      = fbdev->frame_linesize * fbdev->height;
154 154
     fbdev->time_frame      = AV_NOPTS_VALUE;
155 155
     fbdev->data = mmap(NULL, fbdev->fixinfo.smem_len, PROT_READ, MAP_SHARED, fbdev->fd, 0);
156 156
     if (fbdev->data == MAP_FAILED) {
... ...
@@ -162,15 +162,15 @@ av_cold static int fbdev_read_header(AVFormatContext *avctx,
162 162
     st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
163 163
     st->codec->codec_id   = CODEC_ID_RAWVIDEO;
164 164
     st->codec->width      = fbdev->width;
165
-    st->codec->height     = fbdev->heigth;
165
+    st->codec->height     = fbdev->height;
166 166
     st->codec->pix_fmt    = pix_fmt;
167 167
     st->codec->time_base  = (AVRational){fbdev->framerate_q.den, fbdev->framerate_q.num};
168 168
     st->codec->bit_rate   =
169
-        fbdev->width * fbdev->heigth * fbdev->bytes_per_pixel * av_q2d(fbdev->framerate_q) * 8;
169
+        fbdev->width * fbdev->height * fbdev->bytes_per_pixel * av_q2d(fbdev->framerate_q) * 8;
170 170
 
171 171
     av_log(avctx, AV_LOG_INFO,
172 172
            "w:%d h:%d bpp:%d pixfmt:%s fps:%d/%d bit_rate:%d\n",
173
-           fbdev->width, fbdev->heigth, fbdev->varinfo.bits_per_pixel,
173
+           fbdev->width, fbdev->height, fbdev->varinfo.bits_per_pixel,
174 174
            av_pix_fmt_descriptors[pix_fmt].name,
175 175
            fbdev->framerate_q.num, fbdev->framerate_q.den,
176 176
            st->codec->bit_rate);
... ...
@@ -224,7 +224,7 @@ static int fbdev_read_packet(AVFormatContext *avctx, AVPacket *pkt)
224 224
     pout = pkt->data;
225 225
 
226 226
     // TODO it'd be nice if the lines were aligned
227
-    for (i = 0; i < fbdev->heigth; i++) {
227
+    for (i = 0; i < fbdev->height; i++) {
228 228
         memcpy(pout, pin, fbdev->frame_linesize);
229 229
         pin  += fbdev->fixinfo.line_length;
230 230
         pout += fbdev->frame_linesize;