summaryrefslogtreecommitdiff
path: root/libavformat/segment.c
Commit message (Collapse)AuthorAge
* segment: copy metadataMichael Niedermayer2013-03-18
| | | | | | Fixes Ticket2230 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf/segment: add support to ffconcat segment listStefano Sabatini2013-03-07
|
* lavf/segment: fix DTS inconsistencies with -reset_timestampsStefano Sabatini2013-02-06
| | | | | | | | | | | The DTS needs to be resynched against the segment start PTS, or the resulting DTS may result < PTS. Reported-by: Owen Jones <riots6@gmail.com> See thread: Subject: [FFmpeg-user] pts/dts error using reset_timestamps while splitting a DVD Date: Sat, 19 Jan 2013 08:58:27 +0000
* lavf/segment: extend PTS debugging log with -reset_timestampsStefano Sabatini2013-02-06
|
* lavf/segment: use correct spelling and value for EXT-X-ALLOW-CACHE tagCarl Eugen Hoyos2013-02-03
| | | | | | | | | Replace wrong "EXT-X-ALLOWCACHE" with "EXT-X-ALLOW-CACHE", and value 1/0 with YES/NO, as per spec. Fix trac ticket #2228. Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* lavf/segment: exit immediately in case of invalid stream specifierStefano Sabatini2013-01-23
| | | | | Avoid duplicated confusing error message, and propagate error code from the failing avformat_match_stream_specifier() call.
* lavf/segment: avoid failure in case -flags +live and -segment_times/frames ↵Stefano Sabatini2013-01-23
| | | | | | | are specified The conflict does not apply any longer, since the M3U8 segment target duration is re-computed every time a new segment is added to the list.
* lavf/segment: drop now pointless segment_list_close() functionStefano Sabatini2013-01-23
|
* lavf/segment: mark #EXT-X-ENDLIST in M3U8 only at the end of streamStefano Sabatini2013-01-23
| | | | | | Should fix immediate playback termination. In particular, should fix trac ticket #2172.
* lavf/segment: provide link to HTML M3U8 draft, also fix mentioned version in ↵Stefano Sabatini2013-01-22
| | | | docs
* lavf/segment: do not auto-select a video stream with attached_pic dispositionStefano Sabatini2013-01-19
| | | | In particular, fix trac ticket #2138.
* lavf/segment: move reference stream selection code to a dedicated functionStefano Sabatini2013-01-19
|
* lavf/segment: remove now unused field list_max_segment_timeStefano Sabatini2013-01-19
|
* lavf/segment: add support to segment list file entries sliding window listingStefano Sabatini2013-01-19
| | | | In particular, should fix trac ticket #1842.
* lavf/segment: add SegmentListEntry and use itStefano Sabatini2013-01-19
| | | | | This patch is propedeutic to the incoming patch which adds support to sliding window segment listing.
* lavf/segment: add segment_frames optionStefano Sabatini2012-12-28
| | | | This is meant to address trac ticket #1483.
* lavf/segment: add reference_stream optionStefano Sabatini2012-12-28
|
* lavf/segment: provide more debug feedback when a new segment startsStefano Sabatini2012-12-14
|
* lavf/segment: add missing flags to segmenter option constantsStefano Sabatini2012-12-14
|
* lavf/segment: add segment_start_number optionStefano Sabatini2012-12-13
| | | | Consistent with the image2 muxer.
* lavf/segment: add function set_segment_filename()Stefano Sabatini2012-12-13
| | | | Factorize.
* lavf/segment: add reset_timestamps optionStefano Sabatini2012-12-11
| | | | | | | The new options reset the timestamps at each new segment, so that the generated segments will have timestamps starting close to 0. It is meant to address trac ticket #1425.
* lavf/segment: remove silly assert(), improve feedbackStefano Sabatini2012-12-09
| | | | | The code should not assert in case of invalid user input. Fails gracefully instead.
* lavf/segment: fix value for the M3U8 EXT-X-MEDIAStefano Sabatini2012-11-20
| | | | | | | | | From the M3U8 specification: |The EXT-X-MEDIA-SEQUENCE tag indicates the sequence number of the first |URI that appears in a Playlist file. Previously it was using the list index number. Also remove now unused list_count field.
* lavf/segment: do not pre-increment segment_idx valueStefano Sabatini2012-11-20
| | | | | Increment the value just when a new segment with the given index is started. Simplify logic, improve readability.
* lavf/segment: unbreak behavior for segment muxerStefano Sabatini2012-11-20
| | | | | | | | The segment muxer presumes the use of AVFMT_GLOBALHEADER, ssegment should be use in case of formats which requires no global headers. Regression introduced when merging 0826d8513d14f54da0b519360813327d5836b7fc.
* lavf/segment: consistently use "seg" in segment_start()Stefano Sabatini2012-11-20
|
* lavf/segment: do not copy codec_tag when not availableChanMin Kim2012-11-20
| | | | | | | | | | | | | | Some muxers do not allow stream if codec_tag is incompatible. Sometimes the passed input codec's codec_tag is not compatible with the output muxer. Because the codec_tag field of the segment muxer cannot be set, ffmpeg.c doesn't know how to handle these cases. Signed-off-by: ChanMin Kim <kcm1700@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* segment: fix null ptr derefMichael Niedermayer2012-11-05
| | | | | Fixes CID732220 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '88058d9a994f42e4e9ed4e67baf696bbfe53128c'Michael Niedermayer2012-10-11
|\ | | | | | | | | | | | | | | | | | | | | * 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>
| * segment: support applehttp style listLuca Barbato2012-10-10
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: x86: vc1: call ff_vc1dsp_init_x86() under if (ARCH_X86) x86: cavs: call ff_cavsdsp_init_x86() under if (ARCH_X86) x86: call most of the x86 dsp init functions under if (ARCH_X86) doc: support the new website layout doc: remove a warning from filters.texi doc: initial nut documentation segment: drop global headers setting lavu: fix typo in Makefile Conflicts: doc/Makefile doc/filters.texi doc/t2h.init libavcodec/fmtconvert.c libavcodec/proresdsp.c libavcodec/x86/Makefile libavcodec/x86/vc1dsp_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * segment: drop global headers settingLuca Barbato2012-10-08
| | | | | | | | | | | | | | | | avconv provides an option to set it externally and there isn't a way for the outer demuxer to report the inner demuxer flag. Solves a bad interaction between mpegts and x264, but requires additional setting for the user.
* | segment: reverse pass avoid_negative_ts from the muxerMichael Niedermayer2012-10-06
| | | | | | | | | | | | This fixes failures with formats not supporting negative TS Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '65d12900432ac880d764edbbd36818431484a76e'Michael Niedermayer2012-10-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '65d12900432ac880d764edbbd36818431484a76e': configure: add --enable-lto option x86: cpu: Break out test for cpuid capabilities into separate function x86: ff_get_cpu_flags_x86(): Avoid a pointless variable indirection build: Factor out mpegaudio dependencies to CONFIG_MPEGAUDIO segment: Add comments about calls that only are relevant for some muxers segment: Add an option for omitting the first header and final trailer Conflicts: configure libavcodec/Makefile libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * segment: Add comments about calls that only are relevant for some muxersMartin Storsjö2012-10-04
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * segment: Add an option for omitting the first header and final trailerMartin Storsjö2012-10-04
| | | | | | | | | | | | | | This allows writing totally bare segments, without any header/trailer included anywhere. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'a854362b40f0e458db5a1fb0d2612a5702ee0ace'Michael Niedermayer2012-10-05
|\| | | | | | | | | | | | | * commit 'a854362b40f0e458db5a1fb0d2612a5702ee0ace': segment: Flush buffered data before finishing a segment Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * segment: Flush buffered data before finishing a segmentMartin Storsjö2012-10-04
| | | | | | | | | | | | | | This makes sure any buffered data is written to the segment, for muxers that buffer up data internally (e.g. fragmented mp4). Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'f7b240434c015056bc6319ddbdb8483757cc13e2'Michael Niedermayer2012-10-05
|\| | | | | | | | | | | | | * commit 'f7b240434c015056bc6319ddbdb8483757cc13e2': segment: Set the resend_headers flag for each segment Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * segment: Set the resend_headers flag for each segmentMartin Storsjö2012-10-04
| | | | | | | | | | | | | | | | | | This makes sure new inline headers are emitted when the next packet is written. This allows segmenting mpegts without calling write_header/write_trailer (nor freeing/reiniting the muxer) for each segment. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '378a6315b7c48195ffd94e6aa9aa6d663d42b35e'Michael Niedermayer2012-10-05
|\| | | | | | | | | | | | | | | | | | | * commit '378a6315b7c48195ffd94e6aa9aa6d663d42b35e': segment: Add an option for disabling writing of a header/trailer to each segment Conflicts: libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * segment: Add an option for disabling writing of a header/trailer to each segmentMartin Storsjö2012-10-04
| | | | | | | | | | | | | | | | Some segmented formats (such as fragmented mp4) are "bare", as in, the segment files do not have the same headers/trailers as full normal files of that format have. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'eb447d515956b3ce182d9750083131735f00324c'Michael Niedermayer2012-10-05
|\| | | | | | | | | | | | | | | | | | | * commit 'eb447d515956b3ce182d9750083131735f00324c': segment: Free and reinit the muxer before calling avformat_write_header Conflicts: libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * segment: Free and reinit the muxer before calling avformat_write_headerMartin Storsjö2012-10-04
| | | | | | | | | | | | | | | | | | | | | | | | This makes sure the muxers are set up in the way they expect with no data left around from the previous run (which could cause various issues including memory leaks, depending on the chaine muxer). This fixes memory leaks with the mpegts and flv muxers. It also makes the usage of chained muxers correct. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '73871dc96ff78053b9dcd0eb259b7f5a5308ec87'Michael Niedermayer2012-10-05
|\| | | | | | | | | | | | | | | | | | | * commit '73871dc96ff78053b9dcd0eb259b7f5a5308ec87': segment: Use the public av_write_header/av_write_trailer functions Conflicts: libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * segment: Use the public av_write_header/av_write_trailer functionsMartin Storsjö2012-10-04
| | | | | | | | | | | | | | | | | | With this change, the segmenter muxer doesn't rely on anything not available/supported to libavformat external users, making the segmenter muxer do things just like a normal segmenter application using libavformat would do. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '0edae4e6286096023cdd6adea74722fa06029867'Michael Niedermayer2012-10-05
|\| | | | | | | | | | | | | | | | | | | | | * commit '0edae4e6286096023cdd6adea74722fa06029867': segment: Properly create new AVStreams for the chained muxer segment: Add a missing space Conflicts: libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * segment: Properly create new AVStreams for the chained muxerMartin Storsjö2012-10-04
| | | | | | | | | | | | | | | | | | Before, the chained muxer reused the AVStreams array from the outer muxer, which made it impossible to use the proper public functions (such as av_write_frame) when calling the chained muxer. Signed-off-by: Martin Storsjö <martin@martin.st>
| * segment: Add a missing spaceMartin Storsjö2012-10-04
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>