Shorten instead of dropping overlapping subtitles in mp4

If the non-overlaping remainder is greater than 0.5 seconds, shorten
the subtitle instead of completely dropping it.


git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3897 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 10 insertions, 0 deletions

diff --git a/libhb/muxmp4.c b/libhb/muxmp4.c
index e206f3c13..b1148819a 100644
--- a/libhb/muxmp4.c
+++ b/libhb/muxmp4.c
@@ -1111,6 +1111,16 @@ static int MP4Mux( hb_mux_object_t * m, hb_mux_data_t * mux_data,
                code should coalesce overlapping subtitle lines. */
             if( buf->start < mux_data->sum_dur )
             {
+                if ( buf->stop - mux_data->sum_dur > 90*500 )
+                {
+                    hb_log("MP4Mux: shortening overlapping subtitle, "
+                           "start %"PRId64", stop %"PRId64", sum_dur %"PRId64,
+                           buf->start, buf->stop, m->sum_dur);
+                    buf->start = mux_data->sum_dur;
+                }
+            }
+            if( buf->start < mux_data->sum_dur )
+            {
                 hb_log("MP4Mux: skipping overlapping subtitle, "
                        "start %"PRId64", stop %"PRId64", sum_dur %"PRId64,
                        buf->start, buf->stop, m->sum_dur);