diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-17 15:57:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-17 16:04:41 +0200 |
| commit | 7f20440b4c17c26067d588420449ae9066cad237 (patch) | |
| tree | d226ca3939e5bb15a6f799109b521c45a39364a7 /libavformat/mov.c | |
| parent | 5d12ec8fb7e6022f23e5c155e42e531cea9bd860 (diff) | |
| parent | 7f8d41eb097e8d4223c9caf97dd332a2fdb29d52 (diff) | |
Merge commit '7f8d41eb097e8d4223c9caf97dd332a2fdb29d52'
* commit '7f8d41eb097e8d4223c9caf97dd332a2fdb29d52':
mov: Don't use a negative duration for setting other fields
Conflicts:
libavformat/mov.c
See: 87d073eaccc00ef2909445ae4b25128c440d9efa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 424b8adf30..abeeaaed1f 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -3396,7 +3396,7 @@ static int mov_read_header(AVFormatContext *s) for (i = 0; i < s->nb_streams; i++) { AVStream *st = s->streams[i]; MOVStreamContext *sc = st->priv_data; - if (st->duration) + if (st->duration > 0) st->codec->bit_rate = sc->data_size * 8 * sc->time_scale / st->duration; } } |