diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-19 03:23:50 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-19 03:23:50 +0200 |
| commit | e46317a1db077a7f92ea5db7bb76e6cc899f1a64 (patch) | |
| tree | 077078d79610f76cce2e38217f452a4da2b9287c /libvo | |
| parent | 186e5a998c8424b3c850b62d6f5755a0928cd64c (diff) | |
| parent | 908286b437f3b8c8564db3c77456d5350588fb17 (diff) | |
| download | mpv-e46317a1db077a7f92ea5db7bb76e6cc899f1a64.tar.bz2 mpv-e46317a1db077a7f92ea5db7bb76e6cc899f1a64.tar.xz | |
Merge svn changes up to r28655
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/vo_vdpau.c | 4 | ||||
| -rw-r--r-- | libvo/vo_yuv4mpeg.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libvo/vo_vdpau.c b/libvo/vo_vdpau.c index 41dafaa169..1a167ba2c3 100644 --- a/libvo/vo_vdpau.c +++ b/libvo/vo_vdpau.c @@ -654,14 +654,16 @@ static uint32_t get_image(mp_image_t *mpi) static int query_format(uint32_t format) { + int default_flags = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | VFCAP_OSD; switch (format) { case IMGFMT_YV12: + return default_flags | VOCAP_NOSLICES; case IMGFMT_VDPAU_MPEG1: case IMGFMT_VDPAU_MPEG2: case IMGFMT_VDPAU_H264: case IMGFMT_VDPAU_WMV3: case IMGFMT_VDPAU_VC1: - return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | VFCAP_OSD; + return default_flags; } return 0; } diff --git a/libvo/vo_yuv4mpeg.c b/libvo/vo_yuv4mpeg.c index 420e7fea91..bd4300eee6 100644 --- a/libvo/vo_yuv4mpeg.c +++ b/libvo/vo_yuv4mpeg.c @@ -102,7 +102,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, { AVRational pixelaspect = av_div_q((AVRational){d_width, d_height}, (AVRational){width, height}); - AVRational fps_frac = av_d2q(vo_fps, INT_MAX); + AVRational fps_frac = av_d2q(vo_fps, vo_fps * 1001 + 2); if (image_width == width && image_height == height && image_fps == vo_fps && vo_config_count) return 0; |