[vlc-commits] Preserve offsets set by demuxer

[Stephan Krempel]

vlc | branch: master | Stephan Krempel <stephan.krempel at gmx.de> | Thu Oct  6 17:57:24 2011 +0200| [0df8d78a9bf243e6250ccc804ef1fc46bed01ba6] | committer: Laurent Aimar

Preserve offsets set by demuxer

* 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 at videolan.org>
Signed-off-by: Laurent Aimar <fenrir at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0df8d78a9bf243e6250ccc804ef1fc46bed01ba6
---

 src/input/decoder.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/input/decoder.c b/src/input/decoder.c
index efee194..c285bec 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -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;
             }
         }