aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/hlsenc.c
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2015-12-22 02:37:08 -0500
committerSteve Kondik <steve@cyngn.com>2015-12-22 02:37:08 -0500
commitbc1e061c245cfb1d8a8fdd52cfa394bf117f770a (patch)
tree05f33f51bab749a67c82c67ae34a4f83edeb903a /libavformat/hlsenc.c
parenta4a2a44d6836e2f58d9112bdb384e4f2cfac905d (diff)
parent79f407b79a825c3123aff65cef64b383eca5a95e (diff)
downloadandroid_external_ffmpeg-bc1e061c245cfb1d8a8fdd52cfa394bf117f770a.tar.gz
android_external_ffmpeg-bc1e061c245cfb1d8a8fdd52cfa394bf117f770a.tar.bz2
android_external_ffmpeg-bc1e061c245cfb1d8a8fdd52cfa394bf117f770a.zip
Merge branch 'release/2.8' of https://github.com/FFmpeg/FFmpeg into cm-13.0
Diffstat (limited to 'libavformat/hlsenc.c')
-rw-r--r--libavformat/hlsenc.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index 6827b796f4..ebc5e1117b 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -548,8 +548,11 @@ static int hls_start(AVFormatContext *s)
if (oc->oformat->priv_class && oc->priv_data)
av_opt_set(oc->priv_data, "mpegts_flags", "resend_headers", 0);
- if (c->vtt_basename)
- avformat_write_header(vtt_oc,NULL);
+ if (c->vtt_basename) {
+ err = avformat_write_header(vtt_oc,NULL);
+ if (err < 0)
+ return err;
+ }
return 0;
}