diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-11 14:28:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-11 14:28:18 +0200 |
| commit | b6c3487e7f2f8f0d8fae9df023c46ed3112c7443 (patch) | |
| tree | 414b4d0e04e8e7763a36600f9763a8ef8a279510 /libavformat/segment.c | |
| parent | de31814ab07fd971d24c66a5e1ecf464b7ebe033 (diff) | |
| parent | 88058d9a994f42e4e9ed4e67baf696bbfe53128c (diff) | |
| download | ffmpeg-b6c3487e7f2f8f0d8fae9df023c46ed3112c7443.tar.gz | |
Merge commit '88058d9a994f42e4e9ed4e67baf696bbfe53128c'
* commit '88058d9a994f42e4e9ed4e67baf696bbfe53128c':
vc1dec: Set chroma reference field from REFFIELD for 1REF field pictures
segment: support applehttp style list
Conflicts:
libavformat/segment.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/segment.c')
| -rw-r--r-- | libavformat/segment.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavformat/segment.c b/libavformat/segment.c index ad9770eb5d..b6697e0940 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -494,13 +494,15 @@ static int seg_write_trailer(struct AVFormatContext *s) AVFormatContext *oc = seg->avf; int ret; if (!seg->write_header_trailer) { - ret = segment_end(s, 0); + if ((ret = segment_end(s, 0)) < 0) + goto fail; open_null_ctx(&oc->pb); - av_write_trailer(oc); + ret = av_write_trailer(oc); close_null_ctx(oc->pb); } else { ret = segment_end(s, 1); } +fail: if (seg->list) segment_list_close(s); @@ -527,6 +529,7 @@ static const AVOption options[] = { { "csv", "csv format", 0, AV_OPT_TYPE_CONST, {.i64=LIST_TYPE_CSV }, INT_MIN, INT_MAX, 0, "list_type" }, { "ext", "extended format", 0, AV_OPT_TYPE_CONST, {.i64=LIST_TYPE_EXT }, INT_MIN, INT_MAX, 0, "list_type" }, { "m3u8", "M3U8 format", 0, AV_OPT_TYPE_CONST, {.i64=LIST_TYPE_M3U8 }, INT_MIN, INT_MAX, 0, "list_type" }, + { "hls", "Apple HTTP Live Streaming compatible", 0, AV_OPT_TYPE_CONST, {.i64=LIST_TYPE_M3U8 }, INT_MIN, INT_MAX, 0, "list_type" }, { "segment_time", "set segment duration", OFFSET(time_str),AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E }, { "segment_time_delta","set approximation value used for the segment times", OFFSET(time_delta_str), AV_OPT_TYPE_STRING, {.str = "0"}, 0, 0, E }, { "segment_times", "set segment split time points", OFFSET(times_str),AV_OPT_TYPE_STRING,{.str = NULL}, 0, 0, E }, |