Re: [libav-devel] [PATCH 3/4] avformat/mov: fill in subtitle dimensions after parsing tkhd

2014-03-30 Thread Martin Storsjö
On Thu, 20 Mar 2014, wm4 wrote: From: Michael Niedermayer michae...@gmx.at Sample: NeroRecodeSample.mp4 Signed-off-by: Michael Niedermayer michae...@gmx.at Conflicts: libavformat/mov.c --- libavformat/mov.c | 14 +- 1 file changed, 13 insertions(+), 1 deletion(-) diff

[libav-devel] [PATCH 3/4] avformat/mov: fill in subtitle dimensions after parsing tkhd

2014-03-20 Thread wm4
From: Michael Niedermayer michae...@gmx.at Sample: NeroRecodeSample.mp4 Signed-off-by: Michael Niedermayer michae...@gmx.at Conflicts: libavformat/mov.c --- libavformat/mov.c | 14 +- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/libavformat/mov.c

Re: [libav-devel] [PATCH 3/4] avformat/mov: fill in subtitle dimensions after parsing tkhd

2014-03-20 Thread Diego Biurrun
On Thu, Mar 20, 2014 at 09:05:36AM +0100, wm4 wrote: From: Michael Niedermayer michae...@gmx.at Sample: NeroRecodeSample.mp4 Signed-off-by: Michael Niedermayer michae...@gmx.at Conflicts: libavformat/mov.c Please drop such conflict markers in the future. For now, it can be removed