diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-15 16:24:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-15 18:19:58 +0200 |
| commit | 2b37864e7f2bb78fd78904074f03449f70331e3d (patch) | |
| tree | e69100e9ec952178637e8569796735921fe3388d /libavformat/mux.c | |
| parent | 18255441dd74e0bde4fbc8f2f6a1a356fc14df6e (diff) | |
| parent | 2d6e58497e76836604364b037df9b00ba3d75b69 (diff) | |
Merge commit '2d6e58497e76836604364b037df9b00ba3d75b69'
* commit '2d6e58497e76836604364b037df9b00ba3d75b69':
lavf: switch to AVCodecContext.framerate for demuxing
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mux.c')
| -rw-r--r-- | libavformat/mux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mux.c b/libavformat/mux.c index 3c4853594c..f29d7319e6 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -455,7 +455,7 @@ static int compute_pkt_fields2(AVFormatContext *s, AVStream *st, AVPacket *pkt) /* duration field */ if (pkt->duration == 0) { - ff_compute_frame_duration(&num, &den, st, NULL, pkt); + ff_compute_frame_duration(s, &num, &den, st, NULL, pkt); if (den && num) { pkt->duration = av_rescale(1, num * (int64_t)st->time_base.den * st->codec->ticks_per_frame, den * (int64_t)st->time_base.num); } |