From d58bd4546f602bf2957ae3b7c2094d1432142921 Mon Sep 17 00:00:00 2001
From: Petri Hintukainen <phintuka@users.sourceforge.net>
Date: Thu, 26 Apr 2012 22:07:40 +0300
Subject: Fixed merge error

---
 src/demuxers/demux_qt.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c
index d51cf3d48..7c08605fa 100644
--- a/src/demuxers/demux_qt.c
+++ b/src/demuxers/demux_qt.c
@@ -1640,7 +1640,9 @@ static qt_error parse_trak_atom (qt_trak *trak,
       }
       trak->time_to_sample_table[j].count = 0; /* terminate with zero */
 
-    } else if (current_atom == CTTS_ATOM) {
+      break;
+
+    case CTTS_ATOM:
 
       /* TJ. this has the same format as stts. If present, duration here
          means (pts - dts), while the corresponding stts defines dts. */
-- 
cgit v1.2.3