diff options
| author | siretart <siretart@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-06-03 17:37:58 +0000 |
|---|---|---|
| committer | siretart <siretart@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-06-03 17:37:58 +0000 |
| commit | d6d87593a7bb372ad34b3c8f1901b95b86e38e1f (patch) | |
| tree | f1fa969f0b1a94f6122aa2b60b2fe6c7997a0d93 /libvo | |
| parent | de6a0324d8eb70b70968d4129d4aee8e536dd68f (diff) | |
| download | mpv-d6d87593a7bb372ad34b3c8f1901b95b86e38e1f.tar.bz2 mpv-d6d87593a7bb372ad34b3c8f1901b95b86e38e1f.tar.xz | |
vo_yuv4mpeg: disable RGB support when compiling against a shared libswscale
This avoids using swscale internals when compiling against a shared libswscale.
Patch inspired by Uoti Urpala's work in his git branch:
http://repo.or.cz/w/mplayer.git/commitdiff/cd4e8dc1fa2863dcce62a44dd9ea105f9f9288f4
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31310 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/vo_yuv4mpeg.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/libvo/vo_yuv4mpeg.c b/libvo/vo_yuv4mpeg.c index f4cbfb1639..d06e79903d 100644 --- a/libvo/vo_yuv4mpeg.c +++ b/libvo/vo_yuv4mpeg.c @@ -56,7 +56,9 @@ #include "fastmemcpy.h" #include "libswscale/swscale.h" +#ifdef CONFIG_LIBSWSCALE_A #include "libswscale/rgb2rgb.h" +#endif #include "libmpcodecs/vf_scale.h" #include "libavutil/rational.h" @@ -228,6 +230,7 @@ static void draw_osd(void) vo_draw_text(image_width, image_height, draw_alpha); } +#ifdef CONFIG_LIBSWSCALE_A static void deinterleave_fields(uint8_t *ptr, const int stride, const int img_height) { @@ -258,6 +261,7 @@ static void deinterleave_fields(uint8_t *ptr, const int stride, } free(line_state); } +#endif static void vo_y4m_write(const void *ptr, const size_t num_bytes) { @@ -318,14 +322,15 @@ static int write_last_frame(void) static void flip_page (void) { - uint8_t *upper_y, *upper_u, *upper_v, *rgb_buffer_lower; - int rgb_stride, uv_stride, field_height; - unsigned int i, low_ofs; - fprintf(yuv_out, "FRAME\n"); +#ifdef CONFIG_LIBSWSCALE_A if (using_format != IMGFMT_YV12) { + uint8_t *upper_y, *upper_u, *upper_v, *rgb_buffer_lower; + int rgb_stride, uv_stride, field_height; + unsigned int i, low_ofs; + rgb_stride = image_width * 3; uv_stride = image_width / 2; @@ -374,6 +379,7 @@ static void flip_page (void) image_width, image_height, image_width, uv_stride, rgb_stride); } +#endif /* Write progressive frame */ vo_y4m_write(image, write_bytes); |