Mercurial > mplayer.hg
changeset 4514:4e21ffb56104
Forgot the osd fix in the other patch, well, here it is ;)
| author | mswitch |
|---|---|
| date | Sun, 03 Feb 2002 15:10:47 +0000 |
| parents | 2e3800da1ceb |
| children | 4064940f3f9b |
| files | libvo/vo_dxr3.c |
| diffstat | 1 files changed, 3 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/vo_dxr3.c Sun Feb 03 14:55:27 2002 +0000 +++ b/libvo/vo_dxr3.c Sun Feb 03 15:10:47 2002 +0000 @@ -170,7 +170,7 @@ avc_context->width = v_width; avc_context->height = v_height; avc_context->frame_rate = 30 * FRAME_RATE_BASE; - avc_context->gop_size = 0; + avc_context->gop_size = 12; avc_context->bit_rate = 8e6; avc_context->flags = CODEC_FLAG_HQ; avc_context->pix_fmt = PIX_FMT_YUV420P; @@ -243,13 +243,10 @@ switch (img_format) { case IMGFMT_BGR24: case IMGFMT_YV12: + case IMGFMT_YUY2: vo_draw_alpha_yv12(w, h, src, srca, srcstride, avc_picture.data[0] + (x0 + d_pos_x) + (y0 + d_pos_y) * avc_picture.linesize[0], avc_picture.linesize[0]); break; - case IMGFMT_YUY2: - vo_draw_alpha_yuy2(w, h, src, srca, srcstride, - avc_picture.data[0] + (x0 + d_pos_x) * 2 + (y0 + d_pos_y) * avc_picture.linesize[0], avc_picture.linesize[0]); - break; } #endif } @@ -286,6 +283,7 @@ rgb24toyv12(src[0], avc_picture.data[0], avc_picture.data[1], avc_picture.data[2], v_width, v_height, avc_picture.linesize[0], avc_picture.linesize[1], v_width*3); } + draw_osd(); size = avcodec_encode_video(avc_context, avc_outbuf, avc_outbuf_size, &avc_picture); write(fd_video, avc_outbuf, size); return 0;