summaryrefslogtreecommitdiff
path: root/ffserver.c
Commit message (Collapse)AuthorAge
* ffserver: print error code description in case of write_header() failureStefano Sabatini2013-11-30
| | | | Improve feedback.
* ffserver: improve error feedback in case of write_header() failureStefano Sabatini2013-11-29
|
* ffserver: improve feedback in case no feed is defined for a streamStefano Sabatini2013-11-29
|
* ffserver: improve feedback in case of stream with unknown feed nameStefano Sabatini2013-11-29
|
* ffserver: deprecate inconsistent parsing behavior of Truncate optionStefano Sabatini2013-11-29
| | | | | Also make it accept the more consistent behavior (boolean option set to true when specified).
* ffserver: extend feedback in http_start_receive_data()Stefano Sabatini2013-11-29
|
* ffserver: fix typo in comment: defaut -> defaultStefano Sabatini2013-11-28
|
* ffserver: factorize code setting ReadOnlyFile/File optionsStefano Sabatini2013-11-28
|
* ffserver: improve error feedback in open_input_stream()Stefano Sabatini2013-11-28
|
* ffserver: drop stream AudioQuality optionStefano Sabatini2013-11-28
| | | | It has no effect, and it was never documented.
* ffserver: add comment about how Launch path program is createdStefano Sabatini2013-11-28
|
* ffserver: extend error handling when parsing the configuration fileStefano Sabatini2013-11-28
| | | | | In particular, abort immediately in case of memory error, avoid potential crashes.
* ffserver: add some error handling to main()Stefano Sabatini2013-11-28
|
* ffserver: clarify feedback in case of wrong AVOptionAudio/Video errorStefano Sabatini2013-11-28
|
* ffserver: factorize opt_audio/video_codecStefano Sabatini2013-11-27
| | | | Simplify.
* ffserver: strip odd chars from html error messages before sending them backMichael Niedermayer2013-10-09
| | | | | | Fixes Ticket3034 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffserver: allow choosing the pixel formatAlexey Balekhov2013-09-14
| | | | | | Fixes Ticket2954 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffserver: allocate rc_eq, prevent freeing invalid pointerMichael Niedermayer2013-08-13
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '612a5049d9b4ac1c2a293daf75fe814b7a94fdc7'Michael Niedermayer2013-08-06
|\ | | | | | | | | | | | | | | * commit '612a5049d9b4ac1c2a293daf75fe814b7a94fdc7': avserver: do not use a static string as a default for a string option See: 19c41c6d8ef6cc34cfde6bf877e059689e763bb7 Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b7e6da988bfd5def40ccf3476eb8ce2f98a969a5'Michael Niedermayer2013-08-01
|\| | | | | | | | | | | | | * commit 'b7e6da988bfd5def40ccf3476eb8ce2f98a969a5': rtpproto: Move rtpproto specific function declarations to a separate header Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd010e95f86089abe9a3d4d4a66ac8102312d28a4'Michael Niedermayer2013-07-19
|\| | | | | | | | | | | | | | | | | | | | | * commit 'd010e95f86089abe9a3d4d4a66ac8102312d28a4': avserver: Remove unused loadable module support Conflicts: configure ffserver.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffserver: fix null pointer dereferenceMichael Niedermayer2013-06-04
| | | | | | | | | | Fixes CID732208 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffserver: replace atoll() by strtoll()Michael Niedermayer2013-05-19
| | | | | | | | | | | | this should make it easier to support ffserver with msvc Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffserver/ctime1: avoid using strcpy()Michael Niedermayer2013-03-25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | opt: re-enable memleak fix for duplicated options.Clément Bœsch2013-03-13
| | | | | | | | | | | | | | The memleak fix in a1bcc76e was causing problems when the original string wasn't NULL or av_malloc'ed, thus was disabled. It seems the only OPT_STRING occurence where it needed to be fixed is in ffserver. This commit fixes that specific problem and so re-enable the original code.
* | Merge commit 'ddcca4ba074aa537c3059c76d69eb4ad6316bfe9'Michael Niedermayer2013-03-12
|\| | | | | | | | | | | | | | | * commit 'ddcca4ba074aa537c3059c76d69eb4ad6316bfe9': lavc: stop setting AVFrame.motion_subsample_log2 avserver: don't set deprecated options. Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Remove incorrect use of ctype.h functions.Reimar Döffinger2013-03-03
| | | | | | | | | | | | | | As far as I can tell the code should not change behaviour depending on locale in any of these places. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | ffserver: add missing padding to extradata.Clément Bœsch2012-12-30
| |
* | ffserver: set oformatMichael Niedermayer2012-12-09
| | | | | | | | | | | | Fix Ticket1986 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffserver remove CONFIG_NOCUTILS checkMichael Niedermayer2012-11-27
| | | | | | | | | | | | | | Nothing sets CONFIG_NOCUTILS, i also dont remember anything setting it in the past. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-11-16
|\| | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: x86: dsputil: port to cpuflags crc: av_crc() parameter names should match between .c, .h and doxygen avserver: replace av_read_packet with av_read_frame avserver: fix constness casting warnings Conflicts: libavcodec/x86/dsputil.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffserver: put NoDaemon back so as not not break existing conf files.Michael Niedermayer2012-11-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'bf5f46b4cc47b7a4568119f224057d4ff91b6cdd'Michael Niedermayer2012-11-16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bf5f46b4cc47b7a4568119f224057d4ff91b6cdd': APIChanges: add entry for av_read_packet deprecation mxfdec: fix typo in mxf_read_seek() avserver: use freopen to redirect stdin/out/err to /dev/null avserver: remove daemon mode configure: Check for -Werror parameters on clang doxygen: remove obsolete options from Doxyfile configure: Add option to disable all command line programs Conflicts: Changelog configure doc/APIchanges doc/ffserver.conf doc/ffserver.texi ffserver.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffserver: fix streams and priv_data memleaks when closing a connection.Clément Bœsch2012-11-15
| |
* | ffserver: fix NULL dereference with quoted Stream name.Clément Bœsch2012-11-14
| |
* | ffserver: prefer av_asprintf over malloc+snprintf for Launch setting.Clément Bœsch2012-11-14
| |
* | ffserver: zero dest_addrMichael Niedermayer2012-11-04
| | | | | | | | | | Fixes CID733838 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26'Michael Niedermayer2012-10-28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26': avio: fix pointer type mismatches in avio_enum_protocols() avserver: use socklen_t where appropriate udp: use socklen_t where appropriate network: use HAVE_THREADS instead of local hack af_channelmap: remove stray enum declaration buffersink: remove stray semicolon after function definition Conflicts: libavformat/avio.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffserver: fix printf argument typeMartin Ettl2012-10-25
| |
* | ffm_read_write_index: check lseek return codeMichael Niedermayer2012-10-17
| | | | | | | | | | Fixes CID732184 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffm_write_write_index: check lseek() return codeMichael Niedermayer2012-10-17
| | | | | | | | | | Fixes CID732185 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'a25d912dca9cd553440167e0476c47581359c0fc'Michael Niedermayer2012-10-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a25d912dca9cd553440167e0476c47581359c0fc': avcodec_encode_audio(): fix invalid free pcm-mpeg: correct bitrate calculation ffv1: K&R formatting cosmetics fate: Add rangecoder test network: #include stdint.h in network.h nut: export codec_tag provided by rawvideo avserver: move avserver-specific code from ffmdec.c to avserver.c Conflicts: ffserver.c libavcodec/ffv1.c libavformat/ffmdec.c libavformat/nutenc.c tests/ref/lavfi/crop tests/ref/lavfi/crop_scale tests/ref/lavfi/crop_scale_vflip tests/ref/lavfi/crop_vflip tests/ref/lavfi/null tests/ref/lavfi/pixdesc tests/ref/lavfi/pixfmts_copy tests/ref/lavfi/pixfmts_crop tests/ref/lavfi/pixfmts_hflip tests/ref/lavfi/pixfmts_null tests/ref/lavfi/pixfmts_pad tests/ref/lavfi/pixfmts_scale tests/ref/lavfi/pixfmts_vflip tests/ref/lavfi/scale200 tests/ref/lavfi/scale500 tests/ref/lavfi/vflip tests/ref/lavfi/vflip_crop tests/ref/lavfi/vflip_vflip Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffserver: fix return value of add_codec()Michael Niedermayer2012-10-13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffserver: prevent nb_streams from becoming too largeMichael Niedermayer2012-10-13
| | | | | | | | | | | | Fixes CID732249 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffserver: fix potential buffer overflow, based on wrong fscanf format ↵Martin Ettl2012-10-02
| | | | | | | | | | | | | | | | indentifier. Fixed Ticket1780 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-02
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ARM: fix Thumb PIC on Apple nut: add do {} while (0) to GET_V tiffenc: Check av_malloc() results. tiffenc: Simplify pixel format setup using AVPixFmtDescriptor. Use atexit() instead of defining a custom exit_program() interface. msvc: Fix detection of VFW & Avisynth required libs Conflicts: ffmpeg.c ffmpeg_opt.c ffplay.c ffprobe.c ffserver.c libavcodec/tiffenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avcodec: Convert some commented-out printf/av_log instances to av_dlog avcodec: Drop silly and/or broken printf debug output avcodec: Drop some silly commented-out av_log() invocations avformat: Convert some commented-out printf/av_log instances to av_dlog avformat: Remove non-compiling and/or silly commented-out printf/av_log statements Remove some silly disabled code. ac3dec: ensure get_buffer() gets a buffer for the correct number of channels Conflicts: libavcodec/dnxhddec.c libavcodec/ffv1.c libavcodec/h264.c libavcodec/h264_parser.c libavcodec/mjpegdec.c libavcodec/motion_est_template.c libavcodec/mpegaudiodec.c libavcodec/mpegvideo_enc.c libavcodec/put_bits.h libavcodec/ratecontrol.c libavcodec/wmaenc.c libavdevice/timefilter.c libavformat/asfdec.c libavformat/avidec.c libavformat/avienc.c libavformat/flvenc.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffserver: fix typo in log messageBobby Bingham2012-09-18
| | | | | | | | Signed-off-by: Bobby Bingham <uhmmmm@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-09-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: utvideoenc: Add missing AV_ prefix to codec ID avserver: Add missing #include for av_gettime() configure: Only disable aligned stack on MSVC on 32 bit configure: indentation cosmetics Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffserver: fix unsafe snprintf() return usage.Michael Niedermayer2012-09-09
| | | | | | | | | | Found-by: "Ronald S. Bultje" <rsbultje@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>