summaryrefslogtreecommitdiff
path: root/libavformat/hlsenc.c
Commit message (Collapse)AuthorAge
* Merge commit '30a76487304e7250294c9c0e9fa179bf07fd822a'Michael Niedermayer2012-12-30
|\ | | | | | | | | | | | | | | * commit '30a76487304e7250294c9c0e9fa179bf07fd822a': hlsenc: make segment number unsigned hlsenc: make EXT-X-MEDIA-SEQUENCE always increase Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hlsenc: make segment number unsignedLuca Barbato2012-12-29
| | | | | | | | It will overflow if somebody keeps streaming for a time long enough.
| * hlsenc: make EXT-X-MEDIA-SEQUENCE always increaseKanglin2012-12-29
| |
* | Merge commit '9b1370aced385698bc783747917544ab69ecb373'Michael Niedermayer2012-12-30
|\| | | | | | | | | | | | | | | * commit '9b1370aced385698bc783747917544ab69ecb373': hlsenc: do not add timestamps in different timebases hlsenc: use the correct AV_TIME_BASE macro Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hlsenc: do not add timestamps in different timebasesLuca Barbato2012-12-29
| | | | | | | | | | start_time is in stream timebase units while end_time is in AV_TIME_BASE ones.
| * hlsenc: use the correct AV_TIME_BASE macroKanglin2012-12-29
| | | | | | | | recording_time is in AV_TIME_BASE units.
* | Merge commit '0448f26c97c5ab4858d31e456a4f1738ae783242'Michael Niedermayer2012-12-30
|\| | | | | | | | | | | | | | | * commit '0448f26c97c5ab4858d31e456a4f1738ae783242': hlsenc: keep the playlist to the correct number of items hlsenc: use the segment filename in the playlist entry Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hlsenc: keep the playlist to the correct number of itemsLuca Barbato2012-12-29
| | | | | | | | | | Consider the corner case with a list size larger than the wrap number.
| * hlsenc: use the segment filename in the playlist entryLuca Barbato2012-12-29
| | | | | | | | | | Avoid calling av_get_frame_filename twice, once to generate the segment filename and once to generate the playlist.
* | Merge commit '6dd93ee6f1b050ad7c4b247899e83efa293ee405'Michael Niedermayer2012-12-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6dd93ee6f1b050ad7c4b247899e83efa293ee405': hlsenc: check append_entry return value hlsenc: use the basename to generate the list entries avstring: add av_basename and av_dirname Conflicts: Changelog doc/APIchanges libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hlsenc: check append_entry return valueLuca Barbato2012-12-29
| |
| * hlsenc: use the basename to generate the list entriesLuca Barbato2012-12-29
| | | | | | | | | | | | The segment path is desumed from the playlist path, recording a relative path in the playlist while serving the file could lead to misleading results.
| * hlsenc: Don't duplicate a string constantMartin Storsjö2012-12-24
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * hlsenc: Allocate enough space for the pattern stringStefano Sabatini2012-12-24
| | | | | | | | | | | | | | | | | | If s->filename doesn't contain any period/filename extension to strip away, the buffer will be too small to fit both strings. This isn't any buffer overflow since the concatenation uses av_strlcat with the right buffer size. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'f5f1cf52240759208b42477e2157a7b4409ade10'Michael Niedermayer2012-12-24
|\| | | | | | | | | | | | | | | | | | | | | * commit 'f5f1cf52240759208b42477e2157a7b4409ade10': oggdec: K&R cosmetic formatting hlsenc: correctly report target duration Conflicts: libavformat/oggdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hlsenc: correctly report target durationLuca Barbato2012-12-23
| |
* | lavf/hlsenc: reuse pattern string, rather than redefining itStefano Sabatini2012-12-22
| | | | | | | | Improve robustness.
* | lavf/hlsenc: fix basename size computation off-by-one bugStefano Sabatini2012-12-22
| |
* | lavf/hlsenc: provide some feedback in case of invalid basenameStefano Sabatini2012-12-21
| |
* | lavf/hlsenc: fix minor grammar inconsistencies in the option help messagesStefano Sabatini2012-12-21
| |
* | Merge commit '18e6f087c4a50bede8449ee164778945480be50c'Michael Niedermayer2012-12-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '18e6f087c4a50bede8449ee164778945480be50c': img2: document the options available hls: improve options description hls: use a meaningful long name hls: add start_number option h264: check for invalid zeros_left before writing Conflicts: doc/demuxers.texi doc/muxers.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hls: use a meaningful long nameLuca Barbato2012-12-08
| |
| * hls: add start_number optionLuca Barbato2012-12-08
| |
* | Merge commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2'Michael Niedermayer2012-11-14
|/ | | | | | | | | | | | | | | | | | | | * commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2': x86: h264_weight_10bit: port to cpuflags libtheoraenc: add missing pixdesc.h header avcodec: remove ff_is_hwaccel_pix_fmt pixdesc: add av_pix_fmt_get_chroma_sub_sample hlsenc: stand alone hls segmenter Conflicts: doc/muxers.texi libavcodec/ffv1enc.c libavcodec/imgconvert.c libavcodec/mpegvideo_enc.c libavcodec/tiffenc.c libavformat/Makefile libavformat/allformats.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* hlsenc: stand alone hls segmenterLuca Barbato2012-11-13
Simplifies usage but has higher latency.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-25 17:37:37 +0000