diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-06 03:42:14 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-06 03:42:14 +0200 |
commit | 6638207bce4eabd3f99295c1ab096d2815eff3ce (patch) | |
tree | 7ffc8358858c6628812a7514dc6e11d02083b2e2 /libavcodec/dnxhddec.c | |
parent | 2c1c0c5024f8e82200874762cbeeda494875b7e3 (diff) | |
parent | e83c2ddebf8ee90086d8e34de9c8ba245f548f89 (diff) | |
download | ffmpeg-6638207bce4eabd3f99295c1ab096d2815eff3ce.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Fix 'heigth' vs. 'height' typos.
lavc/lavf: use unique private classes.
lavc: use designated initializers for av_codec_context_class
Conflicts:
libavdevice/fbdev.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dnxhddec.c')
-rw-r--r-- | libavcodec/dnxhddec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c index 04d42398e7..ad56aabd0e 100644 --- a/libavcodec/dnxhddec.c +++ b/libavcodec/dnxhddec.c @@ -122,7 +122,7 @@ static int dnxhd_decode_header(DNXHDContext *ctx, const uint8_t *buf, int buf_si ctx->height = AV_RB16(buf + 0x18); 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) { ctx->avctx->pix_fmt = PIX_FMT_YUV422P10; |