diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-28 22:27:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-04 23:52:28 +0200 |
| commit | 1d987a34d8b509e5de358805f34d46f873555370 (patch) | |
| tree | 904bc0d61924ce3bf2de3c0d97fbe1551125e2de | |
| parent | 6099d1ca0e60cc77936108f88a24a9b6c2b024b8 (diff) | |
| download | ffmpeg-1d987a34d8b509e5de358805f34d46f873555370.tar.gz | |
avformat/hlsenc: export inner muxer timebase
Fixes "Non-monotonous DTS in output stream 0:0"
Fies Ticket 3797
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b1a0fccd023d9261274a92ec9482da03c4aa82fa)
Conflicts:
libavformat/hlsenc.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/hlsenc.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 11f1e5be42..cc142fa474 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -22,6 +22,7 @@ #include <float.h> #include <stdint.h> +#include "libavutil/avassert.h" #include "libavutil/mathematics.h" #include "libavutil/parseutils.h" #include "libavutil/avstring.h" @@ -251,6 +252,12 @@ static int hls_write_header(AVFormatContext *s) if ((ret = avformat_write_header(hls->avf, NULL)) < 0) goto fail; + av_assert0(s->nb_streams == hls->avf->nb_streams); + for (i = 0; i < s->nb_streams; i++) { + AVStream *inner_st = hls->avf->streams[i]; + AVStream *outter_st = s->streams[i]; + avpriv_set_pts_info(outter_st, inner_st->pts_wrap_bits, inner_st->time_base.num, inner_st->time_base.den); + } fail: if (ret) { |