16 Commits

Author	SHA1	Message	Date
Michael Niedermayer	2ce43b37fc	Merge commit '6dd93ee6f1b050ad7c4b247899e83efa293ee405' ... * 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>	2012-12-30 13:54:50 +01:00
Luca Barbato	6dd93ee6f1	hlsenc: check append_entry return value	2012-12-29 17:26:29 +01:00
Luca Barbato	66f7b4862f	hlsenc: use the basename to generate the list entries ... 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.	2012-12-29 17:26:29 +01:00
Michael Niedermayer	c6664242e0	Merge commit 'f5f1cf52240759208b42477e2157a7b4409ade10' ... * commit 'f5f1cf52240759208b42477e2157a7b4409ade10': oggdec: K&R cosmetic formatting hlsenc: correctly report target duration Conflicts: libavformat/oggdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-24 14:43:03 +01:00
Martin Storsjö	4a9f7d2bf9	hlsenc: Don't duplicate a string constant ... Signed-off-by: Martin Storsjö <martin@martin.st>	2012-12-24 00:02:48 +02:00
Stefano Sabatini	3193b13aa1	hlsenc: Allocate enough space for the pattern string ... 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>	2012-12-24 00:02:45 +02:00
Luca Barbato	7e98956e72	hlsenc: correctly report target duration	2012-12-23 12:13:41 +01:00
Stefano Sabatini	60c801c679	lavf/hlsenc: reuse pattern string, rather than redefining it ... Improve robustness.	2012-12-22 22:02:06 +01:00
Stefano Sabatini	005b360b9c	lavf/hlsenc: fix basename size computation off-by-one bug	2012-12-22 22:02:06 +01:00
Stefano Sabatini	340b7caf54	lavf/hlsenc: provide some feedback in case of invalid basename	2012-12-21 00:07:21 +01:00
Stefano Sabatini	28b96efab5	lavf/hlsenc: fix minor grammar inconsistencies in the option help messages	2012-12-21 00:07:13 +01:00
Michael Niedermayer	5de1f7a7bd	Merge commit '18e6f087c4a50bede8449ee164778945480be50c' ... * 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>	2012-12-09 13:35:49 +01:00
Luca Barbato	adbe03077d	hls: use a meaningful long name	2012-12-08 17:04:22 +01:00
Luca Barbato	5fbceb2c63	hls: add start_number option	2012-12-08 17:04:22 +01:00
Michael Niedermayer	e13d5e9a4b	Merge commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2' ... * 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>	2012-11-14 11:59:20 +01:00
Luca Barbato	22a0827dff	hlsenc: stand alone hls segmenter ... Simplifies usage but has higher latency.	2012-11-13 01:37:05 +01:00