diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index 89980d716278f85da2f9ef032701e8cea40890dd..caf878ffd4ce72ada710e30b495b7098ebc4e41d 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 8afb41f93dae9e7fac5ea008106bab28c56b1754..d79a32798e1bf65d717af8c5baf646ce41a4fbbf 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);