]> git.sesse.net Git - vlc/commitdiff
Preserve offsets set by demuxer
authorStephan Krempel <stephan.krempel@gmx.de>
Thu, 6 Oct 2011 15:57:24 +0000 (17:57 +0200)
committerLaurent Aimar <fenrir@videolan.org>
Tue, 11 Oct 2011 18:17:55 +0000 (20:17 +0200)
* In function vout_new_buffer offsets that are set in
  p_dec->p_owner->video could get lost before.

* Fixes problem with matroska clipping feature (#4600)

Modified-by: Laurent Aimar <fenrir@videolan.org>
Signed-off-by: Laurent Aimar <fenrir@videolan.org>
src/input/decoder.c

index efee19449af1831b6ac9c7271509088a5c8316fa..c285becafe706028d008e9297f23f90e47742a72 100644 (file)
@@ -2352,11 +2352,15 @@ static picture_t *vout_new_buffer( decoder_t *p_dec )
             {
                 fmt.i_visible_width  = p_dec->fmt_in.video.i_visible_width;
                 fmt.i_visible_height = p_dec->fmt_in.video.i_visible_height;
+                fmt.i_x_offset       = p_dec->fmt_in.video.i_x_offset;
+                fmt.i_y_offset       = p_dec->fmt_in.video.i_y_offset;
             }
             else
             {
                 fmt.i_visible_width  = fmt.i_width;
                 fmt.i_visible_height = fmt.i_height;
+                fmt.i_x_offset       = 0;
+                fmt.i_y_offset       = 0;
             }
         }