[xine-cvs] HG: xine-lib-1.2: Fixed merge error

[Petri H. <phi...@us...>]

# HG changeset patch
# User Petri Hintukainen <phi...@us...>
# Date 1335467260 -10800
# Node ID 09bfae6624e20ca499b729a6dd12bcfb5f4d35b0
# Branch  default
# Parent  4198696413aa118ce59f242a17f0ecdf8fd7ba7e
Fixed merge error

diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c
--- a/src/demuxers/demux_qt.c
+++ b/src/demuxers/demux_qt.c
@@ -1640,7 +1640,9 @@
       }
       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. */