videomixer: get height via GST_VIDEO_FRAME_HEIGHT, not _WIDTH

https://bugzilla.gnome.org/show_bug.cgi?id=687330
This commit is contained in:
Douglas Bagnall 2012-11-01 13:03:44 +00:00 committed by Tim-Philipp Müller
parent 79403bcb0c
commit e3c77ba709

View file

@ -253,7 +253,7 @@ blend_##format_name (GstVideoFrame * srcframe, gint xpos, gint ypos, \
\ \
info = srcframe->info.finfo; \ info = srcframe->info.finfo; \
dest_width = GST_VIDEO_FRAME_WIDTH (destframe); \ dest_width = GST_VIDEO_FRAME_WIDTH (destframe); \
dest_height = GST_VIDEO_FRAME_WIDTH (destframe); \ dest_height = GST_VIDEO_FRAME_HEIGHT (destframe); \
\ \
xpos = x_round (xpos); \ xpos = x_round (xpos); \
ypos = y_round (ypos); \ ypos = y_round (ypos); \
@ -498,7 +498,7 @@ blend_##format_name (GstVideoFrame * srcframe, gint xpos, gint ypos, \
\ \
info = srcframe->info.finfo; \ info = srcframe->info.finfo; \
dest_width = GST_VIDEO_FRAME_WIDTH (destframe); \ dest_width = GST_VIDEO_FRAME_WIDTH (destframe); \
dest_height = GST_VIDEO_FRAME_WIDTH (destframe); \ dest_height = GST_VIDEO_FRAME_HEIGHT (destframe); \
\ \
xpos = GST_ROUND_UP_2 (xpos); \ xpos = GST_ROUND_UP_2 (xpos); \
ypos = GST_ROUND_UP_2 (ypos); \ ypos = GST_ROUND_UP_2 (ypos); \