}
s->codec_id = avctx->codec->id;
- /* for h263, we allocate the images after having read the header */
+ /* for H.263, we allocate the images after having read the header */
if (avctx->codec->id != AV_CODEC_ID_H263 &&
avctx->codec->id != AV_CODEC_ID_MPEG4) {
avctx->pix_fmt = h263_get_format(avctx);
s->mv_dir = MV_DIR_FORWARD;
s->mv_type = MV_TYPE_16X16;
- ff_dlog(s, "%d %d %06X\n",
- ret, get_bits_count(&s->gb), show_bits(&s->gb, 24));
+ ff_dlog(s, "%d %06X\n",
+ get_bits_count(&s->gb), show_bits(&s->gb, 24));
ret = s->decode_mb(s, s->block);
if (s->pict_type != AV_PICTURE_TYPE_B)
return ret;
if (!s->context_initialized)
- // we need the idct permutaton for reading a custom matrix
+ // we need the idct permutation for reading a custom matrix
ff_mpv_idct_init(s);
/* let's go :-) */
SET_QPEL_FUNC(qpel_pixels_tab[1][15], qpel8_mc33_old_c)
}
- /* After H263 & mpeg4 header decode we have the height, width,
+ /* After H.263 & MPEG-4 header decode we have the height, width,
* and other parameters. So then we could init the picture.
- * FIXME: By the way H263 decoder is evolving it should have
+ * FIXME: By the way H.263 decoder is evolving it should have
* an H263EncContext */
if (s->width != avctx->coded_width ||
s->height != avctx->coded_height ||
const enum AVPixelFormat ff_h263_hwaccel_pixfmt_list_420[] = {
#if CONFIG_H263_VAAPI_HWACCEL || CONFIG_MPEG4_VAAPI_HWACCEL
- AV_PIX_FMT_VAAPI_VLD,
+ AV_PIX_FMT_VAAPI,
#endif
-#if CONFIG_H263_VDPAU_HWACCEL || CONFIG_MPEG4_VDPAU_HWACCEL
+#if CONFIG_MPEG4_VDPAU_HWACCEL
AV_PIX_FMT_VDPAU,
#endif
AV_PIX_FMT_YUV420P,