diff options
| author | Petri Hintukainen <phintuka@users.sourceforge.net> | 2012-04-26 22:07:40 +0300 |
|---|---|---|
| committer | Petri Hintukainen <phintuka@users.sourceforge.net> | 2012-04-26 22:07:40 +0300 |
| commit | d58bd4546f602bf2957ae3b7c2094d1432142921 (patch) | |
| tree | 2226a39fb839f20dca4bf52ac8a02481e19315ba | |
| parent | df6150ea5a8f31221f5fda0627843bb40aec6485 (diff) | |
| download | xine-lib-d58bd4546f602bf2957ae3b7c2094d1432142921.tar.gz xine-lib-d58bd4546f602bf2957ae3b7c2094d1432142921.tar.bz2 | |
Fixed merge error
| -rw-r--r-- | src/demuxers/demux_qt.c | 4 |
1 files changed, 3 insertions, 1 deletions
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. */ |