diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-04-26 09:54:59 +0200 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2013-05-04 10:53:18 +0200 |
| commit | 0662967d2bbdbe90540eaa8c847f521fa4b75aab (patch) | |
| tree | afbefb55cf1d31f231feaa39924f940b0da73486 | |
| parent | ddeb6eeeb1c1343ef40d276335e58a6d75ebd5ba (diff) | |
| download | ffmpeg-0662967d2bbdbe90540eaa8c847f521fa4b75aab.tar.gz | |
hls, segment: fix splitting for audio-only streams.
CC:libav-stable@libav.org
(cherry picked from commit cf679b9476727a237c8006c685ace18acba149ab)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| -rw-r--r-- | libavformat/hlsenc.c | 12 | ||||
| -rw-r--r-- | libavformat/segment.c | 12 |
2 files changed, 14 insertions, 10 deletions
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 4f74b5f04b..c4c0217211 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -250,18 +250,20 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) AVFormatContext *oc = hls->avf; AVStream *st = s->streams[pkt->stream_index]; int64_t end_pts = hls->recording_time * hls->number; - int ret; + int ret, can_split = 1; if (hls->start_pts == AV_NOPTS_VALUE) { hls->start_pts = pkt->pts; hls->end_pts = pkt->pts; } - if ((hls->has_video && st->codec->codec_type == AVMEDIA_TYPE_VIDEO) && - av_compare_ts(pkt->pts - hls->start_pts, st->time_base, - end_pts, AV_TIME_BASE_Q) >= 0 && - pkt->flags & AV_PKT_FLAG_KEY) { + if (hls->has_video) { + can_split = st->codec->codec_type == AVMEDIA_TYPE_VIDEO && + pkt->flags & AV_PKT_FLAG_KEY; + } + if (can_split && av_compare_ts(pkt->pts - hls->start_pts, st->time_base, + end_pts, AV_TIME_BASE_Q) >= 0) { ret = append_entry(hls, av_rescale(pkt->pts - hls->end_pts, st->time_base.num, st->time_base.den)); diff --git a/libavformat/segment.c b/libavformat/segment.c index 8afb41f93d..d79a32798e 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -272,13 +272,15 @@ static int seg_write_packet(AVFormatContext *s, AVPacket *pkt) AVFormatContext *oc = seg->avf; AVStream *st = s->streams[pkt->stream_index]; int64_t end_pts = seg->recording_time * seg->number; - int ret; + int ret, can_split = 1; - if ((seg->has_video && st->codec->codec_type == AVMEDIA_TYPE_VIDEO) && - av_compare_ts(pkt->pts, st->time_base, - end_pts, AV_TIME_BASE_Q) >= 0 && - pkt->flags & AV_PKT_FLAG_KEY) { + if (seg->has_video) { + can_split = st->codec->codec_type == AVMEDIA_TYPE_VIDEO && + pkt->flags & AV_PKT_FLAG_KEY; + } + if (can_split && av_compare_ts(pkt->pts, st->time_base, end_pts, + AV_TIME_BASE_Q) >= 0) { av_log(s, AV_LOG_DEBUG, "Next segment starts at %d %"PRId64"\n", pkt->stream_index, pkt->pts); |