diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-04 23:53:39 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-04 23:53:39 +0200 |
| commit | ca897ff0f84cdc7fc83449d1d06dcc9528edbb97 (patch) | |
| tree | 313c6245e23b257a05f220c65c6cdf2d474323be /src/xine-engine/video_overlay.c | |
| parent | 60a408c3446733dc752979c1eab579c25a4a4897 (diff) | |
| parent | f5dc5087a79d813259a674bd96ba4dea43fb254c (diff) | |
| download | xine-lib-ca897ff0f84cdc7fc83449d1d06dcc9528edbb97.tar.gz xine-lib-ca897ff0f84cdc7fc83449d1d06dcc9528edbb97.tar.bz2 | |
Merge with main repository.
--HG--
rename : src/libffmpeg/dvaudio_decoder.c => src/libffmpeg/ff_dvaudio_decoder.c
rename : src/libffmpeg/video_decoder.c => src/libffmpeg/ff_video_decoder.c
rename : src/libffmpeg/xine_decoder.h => src/libffmpeg/ffmpeg_decoder.h
rename : src/libffmpeg/xine_encoder.c => src/libffmpeg/ffmpeg_encoder.c
Diffstat (limited to 'src/xine-engine/video_overlay.c')
| -rw-r--r-- | src/xine-engine/video_overlay.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/xine-engine/video_overlay.c b/src/xine-engine/video_overlay.c index 3189214a8..04a3034a3 100644 --- a/src/xine-engine/video_overlay.c +++ b/src/xine-engine/video_overlay.c @@ -49,6 +49,8 @@ typedef struct video_overlay_showing_s { typedef struct video_overlay_s { + xine_t *xine; + video_overlay_manager_t video_overlay; pthread_mutex_t events_mutex; @@ -58,7 +60,6 @@ typedef struct video_overlay_s { pthread_mutex_t showing_mutex; video_overlay_showing_t showing[MAX_SHOWING]; int showing_changed; - xine_t *xine; } video_overlay_t; |