summaryrefslogtreecommitdiffstats
path: root/libavformat/segment.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'Michael Niedermayer2015-02-141-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e': avformat: Don't anonymously typedef structs Conflicts: libavformat/adtsenc.c libavformat/aiffenc.c libavformat/avidec.c libavformat/gif.c libavformat/iff.c libavformat/img2dec.c libavformat/jvdec.c libavformat/matroskadec.c libavformat/udp.c libavformat/wtvdec.c Merged-by: Michael Niedermayer <[email protected]>
| * avformat: Don't anonymously typedef structsDiego Biurrun2015-02-141-1/+1
| |
| * segment: Check av_get_frame_filename() return valueVittorio Giovara2015-01-231-1/+5
| | | | | | | | | | CC: [email protected] Bug-Id: CID 1265713
* | avformat/segment: Clear contexts after deallocationMichael Niedermayer2015-01-071-4/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit 'b3f04657368a32a9903406395f865e230b1de348'Michael Niedermayer2015-01-071-7/+20
|\| | | | | | | | | | | | | | | | | | | * commit 'b3f04657368a32a9903406395f865e230b1de348': segment: Fix the failure paths Conflicts: libavformat/segment.c Merged-by: Michael Niedermayer <[email protected]>
| * segment: Fix the failure pathsLuca Barbato2015-01-071-12/+20
| | | | | | | | | | | | | | | | | | A failure in segment_end() or segment_start() would lead to freeing a dangling pointer and in general further calls to seg_write_packet() or to seg_write_trailer() would have the same faulty behaviour. CC: [email protected] Reported-By: [email protected]
* | libavformat/segment.c: Add strftime expansion for segment filename templatesPedro E. M. Brito2014-12-281-2/+13
| | | | | | | | | | | | | | | | | | | | | | Allows expansion of the filename template with strftime() with the option -strftime 1 (disabled by default). This allows segments to be named by time of creation, adding some flexibility. Fixes Ticket 4104 (add strftime to segment muxer) Signed-off-by: Pedro E. M. Brito <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/segment: Use av_freep() avoid leaving stale pointers in memoryMichael Niedermayer2014-12-251-7/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/segment: export inner muxer timebaseMichael Niedermayer2014-11-161-0/+8
| | | | | | | | | | | | | | Fixes "Non-monotonous DTS in output stream 0:0" Fixes Ticket4020 Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/segment: use time_internal.h, simplify codeMichael Niedermayer2014-11-021-4/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | hlsenc.c, segment.c: propagate defaults to mpegtsMika Raento2014-10-171-0/+1
| | | | | | | | | | | | | | | | | | This fixes the abnormally high ts overhead in the files produced by the HLS and segments muxers. See https://trac.ffmpeg.org/ticket/2857 . For example makes it much more likely that it can produces streams that fit under the 64kb App store limit. Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '28816050e47b6dba430a52e429d21a864cffda8e'Michael Niedermayer2014-10-071-0/+1
|\| | | | | | | | | | | | | | | | | | | * commit '28816050e47b6dba430a52e429d21a864cffda8e': lavf: Set the stream time base hint properly for chained muxers Conflicts: libavformat/segment.c Merged-by: Michael Niedermayer <[email protected]>
| * lavf: Set the stream time base hint properly for chained muxersMartin Storsjö2014-10-061-0/+1
| | | | | | | | | | | | | | This avoids warnings about using the codec time base as time base hint. Signed-off-by: Martin Storsjö <[email protected]>
| * cosmetics: Write NULL pointer inequality checks more compactlyGabriel Dume2014-08-151-1/+1
| | | | | | | | Signed-off-by: Diego Biurrun <[email protected]>
* | lavf/segment: abort in case of invalid segment format optionsStefano Sabatini2014-09-081-1/+4
| |
* | lavf/segment: add segment_format_options optionStefano Sabatini2014-09-071-2/+23
| |
* | segment: fix copying stream metadataMika Raento2014-09-021-0/+1
| | | | | | | | | | | | To get mpegts metadata copied when segmenting. Signed-off-by: Michael Niedermayer <[email protected]>
* | segment: use mpegts_flags instead of the deprecated resend_headers optionMika Raento2014-09-021-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/segment: Use avformat_alloc_output_context2()Michael Niedermayer2014-09-021-4/+5
| | | | | | | | | | | | | | | | This avoids having to assign oformat, allows returning the correct error code and allocates priv_data Based on patch by: Mika Raento <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | segment: don't access outside seg->frames arrayMika Raento2014-09-021-1/+1
| | | | | | | | | | | | Fixes wrong number of segments output and undefined memory access. Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/segment: re-interleave packets if neededMichael Niedermayer2014-07-241-1/+1
| | | | | | | | | | | | Fixes part of Ticket 3797 Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/mux: support re-interleaving packets in ff_write_chained()Michael Niedermayer2014-07-241-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | lavf/segment: sanitize segment end time in case last packet do not have a ↵Stefano Sabatini2014-07-221-0/+6
| | | | | | | | | | | | | | | | defined duration In particular, avoids to set segments with duration set to 0 (e.g. segment with a single reference frame for which duration is undefined).
* | lavf/segment: do not allow to create segments with no key-framesStefano Sabatini2014-07-221-8/+9
| | | | | | | | Fix trac ticket #3749.
* | lavf/segment: set segment end time when the first packet arrivesStefano Sabatini2014-07-171-0/+2
| | | | | | | | | | | | Avoid negative durations in case there is a single packet in the current segment, since in that case the end time is still set to the previous segment end time.
* | lavf/segment: fix weird indentStefano Sabatini2014-07-171-4/+4
| |
* | lavf/segment: show incoming packet duration in debug messageStefano Sabatini2014-07-171-1/+2
| |
* | lavf/segment: only use reference frames for computing the segment end timeStefano Sabatini2014-07-171-1/+1
| | | | | | | | | | | | | | This avoids a systematic overestimate of the segments duration when there are several streams. Fix trac ticket #3724.
* | libavformat/segment: change segment_list_size behavior to match ↵Simon Thelen2014-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hls_list_size behavior. Make the segment muxer keep segment_list_size segments instead of segment_list_size + 1 segments. This patch also changes the documentation for segment_list_size to reduce possible confusion over how many segments are kept. this allows the segment list to be limited to containing only one segment which used to be impossible because a segment_list_size of 0 kept all the segments and a segment_list_size of 1 kept 2 segments. Signed-off-by: Simon Thelen <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/segment: remove gettimeofday() use, remove sys/time.hMichael Niedermayer2014-07-081-6/+6
| | | | | | | | | | | | | | It causes portability issues, and would need ifdef hell if its kept Found-by: jamrial Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/segment: simplify localtime* useMichael Niedermayer2014-07-071-7/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/segment: Support cutting at clocktimeDeti fliegl2014-07-071-2/+35
| | | | | | | | | | Signed-off-by: Deti fliegl <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/segment: Use av_malloc_array()Michael Niedermayer2014-05-051-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '87a3ea3192bf5e4aafa08bca8686a2b577eae818'Michael Niedermayer2014-04-301-0/+3
|\| | | | | | | | | | | | | | | | | | | * commit '87a3ea3192bf5e4aafa08bca8686a2b577eae818': segment: Report the current media sequence Conflicts: libavformat/segment.c Merged-by: Michael Niedermayer <[email protected]>
| * segment: Report the current media sequenceLuca Barbato2014-04-301-0/+3
| | | | | | | | Useful for debugging mostly.
* | Merge commit '5c08ae4f37281441188447cd04dcaf7cd7ce031f'Michael Niedermayer2014-04-291-5/+5
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '5c08ae4f37281441188447cd04dcaf7cd7ce031f': segment: Add an option to prepend a string to the list entries Conflicts: doc/muxers.texi libavformat/segment.c See: 5e278c19c752d65fdc1da1ceb599b091f71a4b4b Merged-by: Michael Niedermayer <[email protected]>
| * segment: Add an option to prepend a string to the list entriesEnrique Arizón Benito2014-04-291-0/+5
| | | | | | | | | | | | Useful to generate lists with absolute urls. Signed-off-by: Luca Barbato <[email protected]>
| * hls, segment: fix splitting for audio-only streams.Anton Khirnov2013-04-271-5/+7
| | | | | | | | CC:[email protected]
| * segment: fix NULL pointer dereference in seg_write_header()Xi Wang2012-11-141-1/+1
| | | | | | | | | | | | | | | | Since the pointer `oc' is NULL, oc->oformat->name will cause a null pointer dereference. This patch changes it to seg->oformat->name. Signed-off-by: Xi Wang <[email protected]> Signed-off-by: Martin Storsjö <[email protected]>
* | avformat/HLS: modified EXT-X-MEDIA-SEQUENCE header in order to follow the ↵Willy Aubry2014-03-031-1/+6
| | | | | | | | | | | | | | | | | | | | HLS standard When using the wrap option the EXT-X-MEDIA-SEQUENCE header of the playlist file was reset instead of being incremented. It is now incremented by one for every media URI removed from the playlist file as the standard states. Signed-off-by: Willy Aubry <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | lavf/segment: drop pointless variable oc from seg_write_packet()Stefano Sabatini2014-01-211-4/+1
| |
* | lavf/segment: remove duplicated and inconsistent cleanup code in ↵Stefano Sabatini2014-01-211-6/+0
| | | | | | | | | | | | | | | | seg_write_packet() In particular, avoid to leave around the seg->avf pointer to freed structure, and fix crash with: ffmpeg -f lavfi -i testsrc -c:v h264 -map 0 -f segment foo-%d.ts
* | lavf/segment: increase logging level for message with segment start informationStefano Sabatini2013-12-181-1/+1
| | | | | | | | Help debugging.
* | lavf/segment: add a few log messages when avio_open2() failsStefano Sabatini2013-11-251-3/+9
| |
* | lavf/segment: add segment_list_entry_prefix optionStefano Sabatini2013-11-251-2/+19
| | | | | | | | | | | | | | | | | | This option allows to add a prefix to the segment list entry filenames. Also set by default the list entry filenames to the corresponding segment basename, consistent with the HLS muxer. Based on an idea by Steven Liu <[email protected]>.
* | lavf/segment: simplify logic and fix !=0 check on segment_end return valueStefano Sabatini2013-10-151-5/+3
| | | | | | | | A successfull return value can be > 0.
* | lavf/segment: log segments as they end to AV_LOG_VERBOSEBilly Shambrook2013-10-151-0/+4
| | | | | | | | Signed-off-by: Stefano Sabatini <[email protected]>
* | lavf/segment: simplify segment_count updateStefano Sabatini2013-10-151-6/+4
| | | | | | | | Now segment_count mark the segment_count of the current segment.
* | Reinstate proper FFmpeg license for all files.Thilo Borgmann2013-08-301-4/+4
| |
* | lavf/segment: use AV_OPT_TIME_DURATION for time_deltaStefano Sabatini2013-07-111-11/+1
| | | | | | | | Simplify.
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-23 13:44:21 +0000