summaryrefslogtreecommitdiff
path: root/libavformat/hlsenc.c
Commit message (Collapse)AuthorAgeFilesLines
* avformat/hlsenc: Free context after hls_append_segmentMichael Niedermayer2015-06-101-1/+2
| | | | | | | | | | | | | | | | | | | Fixes reading uninitialized memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 530eb6acf8ee867bf00728bf7efaf505da107e17) Conflicts: libavformat/hlsenc.c (cherry picked from commit 0ac22f043bee2f1c4daf5e1044b014326325d929) Conflicts: libavformat/hlsenc.c (cherry picked from commit 134d3e1c0331462ea94c78a5e13a63b20d283653) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf/hlsenc: fix bogus hls segment index rewrapping logicCarl Eugen Hoyos2013-06-061-4/+2
| | | | | | | | | The counter should not be reset since it detects the hls segment increasing timeframe. Fixes ticket #2643. Reviewed-by: Stefano Sabatini
* Merge commit 'cf679b9476727a237c8006c685ace18acba149ab'Michael Niedermayer2013-04-281-10/+13
|\ | | | | | | | | | | | | | | | | | | | | * commit 'cf679b9476727a237c8006c685ace18acba149ab': hls, segment: fix splitting for audio-only streams. Conflicts: libavformat/hlsenc.c libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hls, segment: fix splitting for audio-only streams.Anton Khirnov2013-04-271-5/+7
| | | | | | | | CC:libav-stable@libav.org
* | lavf/hlsenc: append last incomplete segment when closing the outputStefano Sabatini2013-01-211-4/+12
| | | | | | | | Also introduce missing check on PTS value in case of NOPTS value.
* | Merge commit '92e354b655613b88c3c202a7e19e7037daed37eb'Michael Niedermayer2013-01-091-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '92e354b655613b88c3c202a7e19e7037daed37eb': rtpdec_vp8: Set the timestamp when returning a deferred packet hlsenc: Make the start_number option set the right variable Conflicts: libavformat/hlsenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hlsenc: Make the start_number option set the right variableKanglin2013-01-081-1/+1
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '30a76487304e7250294c9c0e9fa179bf07fd822a'Michael Niedermayer2012-12-301-3/+6
|\ \ | |/ | | | | | | | | | | | | * 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-291-1/+1
| | | | | | | | It will overflow if somebody keeps streaming for a time long enough.
| * hlsenc: make EXT-X-MEDIA-SEQUENCE always increaseKanglin2012-12-291-2/+5
| |
* | Merge commit '9b1370aced385698bc783747917544ab69ecb373'Michael Niedermayer2012-12-301-3/+3
|\ \ | |/ | | | | | | | | | | | | * 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-291-2/+2
| | | | | | | | | | 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-291-1/+1
| | | | | | | | recording_time is in AV_TIME_BASE units.
* | Merge commit '0448f26c97c5ab4858d31e456a4f1738ae783242'Michael Niedermayer2012-12-301-5/+5
|\ \ | |/ | | | | | | | | | | | | * 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-291-2/+4
| | | | | | | | | | Consider the corner case with a list size larger than the wrap number.
| * hlsenc: use the segment filename in the playlist entryLuca Barbato2012-12-291-3/+1
| | | | | | | | | | 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-301-4/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * 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-291-3/+6
| |
| * hlsenc: use the basename to generate the list entriesLuca Barbato2012-12-291-1/+2
| | | | | | | | | | | | 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-241-1/+1
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * hlsenc: Allocate enough space for the pattern stringStefano Sabatini2012-12-241-1/+1
| | | | | | | | | | | | | | | | | | 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-241-1/+7
|\ \ | |/ | | | | | | | | | | | | | | | | | | * 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-231-1/+7
| |
* | lavf/hlsenc: reuse pattern string, rather than redefining itStefano Sabatini2012-12-221-1/+1
| | | | | | | | Improve robustness.
* | lavf/hlsenc: fix basename size computation off-by-one bugStefano Sabatini2012-12-221-1/+1
| |
* | lavf/hlsenc: provide some feedback in case of invalid basenameStefano Sabatini2012-12-211-1/+3
| |
* | lavf/hlsenc: fix minor grammar inconsistencies in the option help messagesStefano Sabatini2012-12-211-4/+4
| |
* | Merge commit '18e6f087c4a50bede8449ee164778945480be50c'Michael Niedermayer2012-12-091-1/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-081-1/+1
| |
| * hls: add start_number optionLuca Barbato2012-12-081-0/+1
| |
* | Merge commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2'Michael Niedermayer2012-11-141-4/+4
|/ | | | | | | | | | | | | | | | | | | | * 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-131-0/+324
Simplifies usage but has higher latency.
View Lorry Controller Status