[FFmpeg-cvslog] avformat/mov: reindent after previous commit
Clément Bœsch
git at videolan.org
Fri Jan 2 11:46:51 CET 2015
ffmpeg | branch: master | Clément Bœsch <clement at stupeflix.com> | Mon Dec 1 15:44:10 2014 +0100| [11201bbf7fc9439457f8c3c5abf43ea72fa7562d] | committer: Clément Bœsch
avformat/mov: reindent after previous commit
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=11201bbf7fc9439457f8c3c5abf43ea72fa7562d
---
libavformat/mov.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/libavformat/mov.c b/libavformat/mov.c
index a509932..f2d4fa0 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2289,21 +2289,21 @@ static void mov_build_index(MOVContext *mov, AVStream *st)
av_log(mov->fc, AV_LOG_WARNING, "multiple edit list entries, "
"a/v desync might occur, patch welcome\n");
- /* adjust first dts according to edit list */
- if ((empty_duration || start_time) && mov->time_scale > 0) {
- if (empty_duration)
- empty_duration = av_rescale(empty_duration, sc->time_scale, mov->time_scale);
- sc->time_offset = start_time - empty_duration;
- current_dts = -sc->time_offset;
- if (sc->ctts_count>0 && sc->stts_count>0 &&
- sc->ctts_data[0].duration / FFMAX(sc->stts_data[0].duration, 1) > 16) {
- /* more than 16 frames delay, dts are likely wrong
- this happens with files created by iMovie */
- sc->wrong_dts = 1;
- st->codec->has_b_frames = 1;
+ /* adjust first dts according to edit list */
+ if ((empty_duration || start_time) && mov->time_scale > 0) {
+ if (empty_duration)
+ empty_duration = av_rescale(empty_duration, sc->time_scale, mov->time_scale);
+ sc->time_offset = start_time - empty_duration;
+ current_dts = -sc->time_offset;
+ if (sc->ctts_count>0 && sc->stts_count>0 &&
+ sc->ctts_data[0].duration / FFMAX(sc->stts_data[0].duration, 1) > 16) {
+ /* more than 16 frames delay, dts are likely wrong
+ this happens with files created by iMovie */
+ sc->wrong_dts = 1;
+ st->codec->has_b_frames = 1;
+ }
}
}
- }
/* only use old uncompressed audio chunk demuxing when stts specifies it */
if (!(st->codec->codec_type == AVMEDIA_TYPE_AUDIO &&
More information about the ffmpeg-cvslog
mailing list