diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-08-04 09:36:07 +0200 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-08-04 09:36:07 +0200 |
| commit | 01b9b5002fb057604855dffc9faac4903df4b8d7 (patch) | |
| tree | e6fc518a8dadb3d755e4ee409becba0cd783fee8 /ext/directfb | |
| parent | 2988a4ccb224f0be59e0b67ca84e88a01bcee8ec (diff) | |
| parent | cc9e4903138894963e52d52dfc22ffb23d763b9c (diff) | |
| download | gstreamer-plugins-bad-01b9b5002fb057604855dffc9faac4903df4b8d7.tar.gz | |
Merge branch 'master' into 0.11
Conflicts:
common
configure.ac
gst/colorspace/colorspace.c
gst/colorspace/colorspace.h
gst/colorspace/gstcolorspace.c
Diffstat (limited to 'ext/directfb')
| -rw-r--r-- | ext/directfb/dfbvideosink.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/directfb/dfbvideosink.c b/ext/directfb/dfbvideosink.c index a6db91073..c32d27af0 100644 --- a/ext/directfb/dfbvideosink.c +++ b/ext/directfb/dfbvideosink.c @@ -2223,8 +2223,8 @@ gst_dfbvideosink_init (GstDfbVideoSink * dfbvideosink) { dfbvideosink->pool_lock = g_mutex_new (); dfbvideosink->buffer_pool = NULL; - dfbvideosink->video_height = dfbvideosink->out_width = 0; - dfbvideosink->video_width = dfbvideosink->out_height = 0; + dfbvideosink->video_height = dfbvideosink->out_height = 0; + dfbvideosink->video_width = dfbvideosink->out_width = 0; dfbvideosink->fps_d = 0; dfbvideosink->fps_n = 0; |