diff options
| author | adrian <adrian@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-09-20 19:07:57 +0000 |
|---|---|---|
| committer | adrian <adrian@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-09-20 19:07:57 +0000 |
| commit | 7bc4102a08ce81fb4768d15393350a7be7f2140d (patch) | |
| tree | f34430bdb6d4bb3bb83943675a90e441c85e2151 /libvo/vo_corevideo.m | |
| parent | a40c6e2018f5d761befd0f3674ad566f042f59e3 (diff) | |
| download | mpv-7bc4102a08ce81fb4768d15393350a7be7f2140d.tar.bz2 mpv-7bc4102a08ce81fb4768d15393350a7be7f2140d.tar.xz | |
Fix vo_corevideo with shared buffer after r29606: Only do GUI dependent display config if shared buffer is not enabled.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29699 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_corevideo.m')
| -rw-r--r-- | libvo/vo_corevideo.m | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libvo/vo_corevideo.m b/libvo/vo_corevideo.m index 18a2820360..e4b5e85545 100644 --- a/libvo/vo_corevideo.m +++ b/libvo/vo_corevideo.m @@ -161,10 +161,6 @@ static void free_file_specific(void) static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format) { free_file_specific(); - config_movie_aspect((float)d_width/d_height); - - vo_dwidth = d_width *= mpGLView->winSizeMult; - vo_dheight = d_height *= mpGLView->winSizeMult; //misc mplayer setup image_width = width; @@ -183,6 +179,11 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_ if(!shared_buffer) { + config_movie_aspect((float)d_width/d_height); + + vo_dwidth = d_width *= mpGLView->winSizeMult; + vo_dheight = d_height *= mpGLView->winSizeMult; + image_data = malloc(image_width*image_height*image_bytes); image_datas[0] = image_data; if (vo_doublebuffering) |