RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix 'heigth' vs. 'height' typos.

This commit is contained in:
Diego Biurrun 2011-10-05 11:12:01 +02:00
parent a4ea00d021
commit e83c2ddebf
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
doc/filters.texi
View File

@ -204,13 +204,13 @@ the computed values for @var{x} and @var{y}. They are evaluated for
each new frame. each new frame.
@item in_w, in_h @item in_w, in_h
the input width and heigth the input width and height
@item iw, ih @item iw, ih
same as @var{in_w} and @var{in_h} same as @var{in_w} and @var{in_h}
@item out_w, out_h @item out_w, out_h
the output (cropped) width and heigth the output (cropped) width and height
@item ow, oh @item ow, oh
same as @var{out_w} and @var{out_h} same as @var{out_w} and @var{out_h}
@ -895,13 +895,13 @@ the corresponding mathematical approximated values for e
(euler number), pi (greek PI), phi (golden ratio) (euler number), pi (greek PI), phi (golden ratio)
@item in_w, in_h @item in_w, in_h
the input video width and heigth the input video width and height
@item iw, ih @item iw, ih
same as @var{in_w} and @var{in_h} same as @var{in_w} and @var{in_h}
@item out_w, out_h @item out_w, out_h
the output width and heigth, that is the size of the padded area as the output width and height, that is the size of the padded area as
specified by the @var{width} and @var{height} expressions specified by the @var{width} and @var{height} expressions
@item ow, oh @item ow, oh
@ -1002,13 +1002,13 @@ the corresponding mathematical approximated values for e
(euler number), pi (greek PI), phi (golden ratio) (euler number), pi (greek PI), phi (golden ratio)
@item in_w, in_h @item in_w, in_h
the input width and heigth the input width and height
@item iw, ih @item iw, ih
same as @var{in_w} and @var{in_h} same as @var{in_w} and @var{in_h}
@item out_w, out_h @item out_w, out_h
the output (cropped) width and heigth the output (cropped) width and height
@item ow, oh @item ow, oh
same as @var{out_w} and @var{out_h} same as @var{out_w} and @var{out_h}
@ -1626,7 +1626,7 @@ alpha specifier. The default value is "black".
@item frame_size @item frame_size
Specify the size of the sourced video, it may be a string of the form 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". default value is "320x240".
@item frame_rate @item frame_rate

2
libavcodec/dnxhddec.c
View File

@ -115,7 +115,7 @@ static int dnxhd_decode_header(DNXHDContext *ctx, const uint8_t *buf, int buf_si
ctx->height = AV_RB16(buf + 0x18); ctx->height = AV_RB16(buf + 0x18);
ctx->width = AV_RB16(buf + 0x1a); ctx->width = AV_RB16(buf + 0x1a);
av_dlog(ctx->avctx, "width %d, heigth %d\n", ctx->width, ctx->height); av_dlog(ctx->avctx, "width %d, height %d\n", ctx->width, ctx->height);
if (buf[0x21] & 0x40) { if (buf[0x21] & 0x40) {
ctx->avctx->pix_fmt = PIX_FMT_YUV422P10; ctx->avctx->pix_fmt = PIX_FMT_YUV422P10;

14
libavdevice/fbdev.c
View File

@ -84,7 +84,7 @@ typedef struct {
int64_t time_frame; ///< time for the next frame to output (in 1/1000000 units) int64_t time_frame; ///< time for the next frame to output (in 1/1000000 units)
int fd; ///< framebuffer device file descriptor int fd; ///< framebuffer device file descriptor
int width, heigth; ///< assumed frame resolution int width, height; ///< assumed frame resolution
int frame_linesize; ///< linesize of the output frame, it is assumed to be constant int frame_linesize; ///< linesize of the output frame, it is assumed to be constant
int bytes_per_pixel; int bytes_per_pixel;
@ -147,10 +147,10 @@ av_cold static int fbdev_read_header(AVFormatContext *avctx,
} }
fbdev->width = fbdev->varinfo.xres; fbdev->width = fbdev->varinfo.xres;
fbdev->heigth = fbdev->varinfo.yres; fbdev->height = fbdev->varinfo.yres;
fbdev->bytes_per_pixel = (fbdev->varinfo.bits_per_pixel + 7) >> 3; fbdev->bytes_per_pixel = (fbdev->varinfo.bits_per_pixel + 7) >> 3;
fbdev->frame_linesize = fbdev->width * fbdev->bytes_per_pixel; fbdev->frame_linesize = fbdev->width * fbdev->bytes_per_pixel;
fbdev->frame_size = fbdev->frame_linesize * fbdev->heigth; fbdev->frame_size = fbdev->frame_linesize * fbdev->height;
fbdev->time_frame = AV_NOPTS_VALUE; fbdev->time_frame = AV_NOPTS_VALUE;
fbdev->data = mmap(NULL, fbdev->fixinfo.smem_len, PROT_READ, MAP_SHARED, fbdev->fd, 0); fbdev->data = mmap(NULL, fbdev->fixinfo.smem_len, PROT_READ, MAP_SHARED, fbdev->fd, 0);
if (fbdev->data == MAP_FAILED) { if (fbdev->data == MAP_FAILED) {
@ -162,15 +162,15 @@ av_cold static int fbdev_read_header(AVFormatContext *avctx,
st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
st->codec->codec_id = CODEC_ID_RAWVIDEO; st->codec->codec_id = CODEC_ID_RAWVIDEO;
st->codec->width = fbdev->width; st->codec->width = fbdev->width;
st->codec->height = fbdev->heigth; st->codec->height = fbdev->height;
st->codec->pix_fmt = pix_fmt; st->codec->pix_fmt = pix_fmt;
st->codec->time_base = (AVRational){fbdev->framerate_q.den, fbdev->framerate_q.num}; st->codec->time_base = (AVRational){fbdev->framerate_q.den, fbdev->framerate_q.num};
st->codec->bit_rate = st->codec->bit_rate =
fbdev->width * fbdev->heigth * fbdev->bytes_per_pixel * av_q2d(fbdev->framerate_q) * 8; fbdev->width * fbdev->height * fbdev->bytes_per_pixel * av_q2d(fbdev->framerate_q) * 8;
av_log(avctx, AV_LOG_INFO, av_log(avctx, AV_LOG_INFO,
"w:%d h:%d bpp:%d pixfmt:%s fps:%d/%d bit_rate:%d\n", "w:%d h:%d bpp:%d pixfmt:%s fps:%d/%d bit_rate:%d\n",
fbdev->width, fbdev->heigth, fbdev->varinfo.bits_per_pixel, fbdev->width, fbdev->height, fbdev->varinfo.bits_per_pixel,
av_pix_fmt_descriptors[pix_fmt].name, av_pix_fmt_descriptors[pix_fmt].name,
fbdev->framerate_q.num, fbdev->framerate_q.den, fbdev->framerate_q.num, fbdev->framerate_q.den,
st->codec->bit_rate); st->codec->bit_rate);
@ -224,7 +224,7 @@ static int fbdev_read_packet(AVFormatContext *avctx, AVPacket *pkt)
pout = pkt->data; pout = pkt->data;
// TODO it'd be nice if the lines were aligned // TODO it'd be nice if the lines were aligned
for (i = 0; i < fbdev->heigth; i++) { for (i = 0; i < fbdev->height; i++) {
memcpy(pout, pin, fbdev->frame_linesize); memcpy(pout, pin, fbdev->frame_linesize);
pin += fbdev->fixinfo.line_length; pin += fbdev->fixinfo.line_length;
pout += fbdev->frame_linesize; pout += fbdev->frame_linesize;