RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
59,773 Commits 36 Branches 392 Tags 312 MiB
Commit Graph

528 Commits

Author SHA1 Message Date
Stefano Sabatini 1d6666a6b8 ffserver: extend report_config_error() facilities, and use it for warnings 2013-12-16 19:19:04 +01:00
Stefano Sabatini 9985710a5a ffserver: add stream Metadata option 
Also deprecate Author, Comment, Copyright, and Title options, and update
docs to use the new Metadata option.
 2013-12-16 19:18:45 +01:00
Stefano Sabatini 33f10fa657 ffserver: fix spacing typoin error message 2013-12-16 18:30:21 +01:00
Stefano Sabatini 93f0882725 ffserver: improve error feedback in case of av_write_frame() error 2013-12-13 09:42:15 +01:00
Stefano Sabatini b58161d6b6 ffserver: print error code description in case of write_header() failure 
Improve feedback.
 2013-11-30 14:35:33 +01:00
Stefano Sabatini 73b8730475 ffserver: improve error feedback in case of write_header() failure 2013-11-29 12:11:39 +01:00
Stefano Sabatini b133ec6244 ffserver: improve feedback in case no feed is defined for a stream 2013-11-29 12:11:34 +01:00
Stefano Sabatini 0083514727 ffserver: improve feedback in case of stream with unknown feed name 2013-11-29 12:11:28 +01:00
Stefano Sabatini b1049f89fa ffserver: deprecate inconsistent parsing behavior of Truncate option 
Also make it accept the more consistent behavior (boolean option set to
true when specified).
 2013-11-29 10:28:03 +01:00
Stefano Sabatini 0124fca03f ffserver: extend feedback in http_start_receive_data() 2013-11-29 10:28:03 +01:00
Stefano Sabatini ab89d2dd2a ffserver: fix typo in comment: defaut -> default 2013-11-28 23:13:46 +01:00
Stefano Sabatini 77f5cb92af ffserver: factorize code setting ReadOnlyFile/File options 2013-11-28 23:13:45 +01:00
Stefano Sabatini 0e1e5d0053 ffserver: improve error feedback in open_input_stream() 2013-11-28 23:13:45 +01:00
Stefano Sabatini ddab41995f ffserver: drop stream AudioQuality option 
It has no effect, and it was never documented.
 2013-11-28 23:13:45 +01:00
Stefano Sabatini 4f60d53b18 ffserver: add comment about how Launch path program is created 2013-11-28 23:13:45 +01:00
Stefano Sabatini 7cbbc4f7e7 ffserver: extend error handling when parsing the configuration file 
In particular, abort immediately in case of memory error, avoid potential
crashes.
 2013-11-28 23:13:45 +01:00
Stefano Sabatini 04702a0d3d ffserver: add some error handling to main() 2013-11-28 23:13:45 +01:00
Stefano Sabatini f7fbb7ac99 ffserver: clarify feedback in case of wrong AVOptionAudio/Video error 2013-11-28 10:19:03 +01:00
Stefano Sabatini 8adaee56c4 ffserver: factorize opt_audio/video_codec 
Simplify.
 2013-11-27 15:48:19 +01:00
Michael Niedermayer 885739f3b4 ffserver: strip odd chars from html error messages before sending them back 
Fixes Ticket3034

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-09 00:30:46 +02:00
Alexey Balekhov 90ca814267 ffserver: allow choosing the pixel format 
Fixes Ticket2954

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-14 03:51:45 +02:00
Michael Niedermayer e85771f268 ffserver: allocate rc_eq, prevent freeing invalid pointer 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-13 15:24:30 +02:00
Michael Niedermayer 4131f21f77 Merge commit '612a5049d9b4ac1c2a293daf75fe814b7a94fdc7' 
* commit '612a5049d9b4ac1c2a293daf75fe814b7a94fdc7':
  avserver: do not use a static string as a default for a string option

See: 19c41c6d8e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 09:13:51 +02:00
Michael Niedermayer fcccb4c11d Merge commit 'b7e6da988bfd5def40ccf3476eb8ce2f98a969a5' 
* commit 'b7e6da988bfd5def40ccf3476eb8ce2f98a969a5':
  rtpproto: Move rtpproto specific function declarations to a separate header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-01 12:03:24 +02:00
Michael Niedermayer 8740762c43 Merge commit 'd010e95f86089abe9a3d4d4a66ac8102312d28a4' 
* commit 'd010e95f86089abe9a3d4d4a66ac8102312d28a4':
  avserver: Remove unused loadable module support

Conflicts:
	configure
	ffserver.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-19 10:26:07 +02:00
Michael Niedermayer 2192f89368 ffserver: fix null pointer dereference 
Fixes CID732208
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-04 13:19:27 +02:00
Michael Niedermayer 73920ac573 ffserver: replace atoll() by strtoll() 
this should make it easier to support ffserver with msvc

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-19 11:13:07 +02:00
Michael Niedermayer 4a595cff79 ffserver/ctime1: avoid using strcpy() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-25 23:31:34 +01:00
Clément Bœsch 19c41c6d8e opt: re-enable memleak fix for duplicated options. 
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.
 2013-03-13 07:25:16 +01:00
Michael Niedermayer dac8799529 Merge commit 'ddcca4ba074aa537c3059c76d69eb4ad6316bfe9' 
* commit 'ddcca4ba074aa537c3059c76d69eb4ad6316bfe9':
  lavc: stop setting AVFrame.motion_subsample_log2
  avserver: don't set deprecated options.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 14:27:54 +01:00
Reimar Döffinger 88d55b827d Remove incorrect use of ctype.h functions. 
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>
 2013-03-03 21:44:10 +01:00
Clément Bœsch 9db5f82032 ffserver: add missing padding to extradata. 2012-12-30 22:22:18 +01:00
Michael Niedermayer cbe43e62c9 ffserver: set oformat 
Fix Ticket1986

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-09 23:39:06 +01:00
Michael Niedermayer c2c1726847 ffserver remove CONFIG_NOCUTILS check 
Nothing sets CONFIG_NOCUTILS, i also dont remember anything setting it in
the past.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-27 14:41:41 +01:00
Michael Niedermayer ff3b59c848 Merge remote-tracking branch 'qatar/master' 
* 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>
 2012-11-16 13:23:35 +01:00
Michael Niedermayer f30cf51d46 ffserver: put NoDaemon back so as not not break existing conf files. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-16 13:12:09 +01:00
Michael Niedermayer 3db32ec119 Merge commit 'bf5f46b4cc47b7a4568119f224057d4ff91b6cdd' 
* 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>
 2012-11-16 13:07:10 +01:00
Clément Bœsch 0e482a8e49 ffserver: fix streams and priv_data memleaks when closing a connection. 2012-11-15 11:52:44 +01:00
Clément Bœsch 26afdbcfc0 ffserver: fix NULL dereference with quoted Stream name. 2012-11-14 10:09:57 +01:00
Clément Bœsch a9ba9268d7 ffserver: prefer av_asprintf over malloc+snprintf for Launch setting. 2012-11-14 10:09:51 +01:00
Michael Niedermayer a04698c4a9 ffserver: zero dest_addr 
Fixes CID733838
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-04 13:00:20 +01:00
Michael Niedermayer 8943ad4014 Merge commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26' 
* 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>
 2012-10-28 13:19:11 +01:00
Martin Ettl cc72d52dc1 ffserver: fix printf argument type 2012-10-25 16:35:57 +00:00
Michael Niedermayer 71bc8c95d7 ffm_read_write_index: check lseek return code 
Fixes CID732184
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-17 20:35:16 +02:00
Michael Niedermayer 378a5b9c5f ffm_write_write_index: check lseek() return code 
Fixes CID732185
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-17 20:23:16 +02:00
Michael Niedermayer d6e87190fd Merge commit 'a25d912dca9cd553440167e0476c47581359c0fc' 
* 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>
 2012-10-17 14:17:55 +02:00
Michael Niedermayer ff814c75a3 ffserver: fix return value of add_codec() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-13 05:36:41 +02:00
Michael Niedermayer 0f46825d98 ffserver: prevent nb_streams from becoming too large 
Fixes CID732249

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-13 00:31:21 +02:00
Martin Ettl f077e1fb4c ffserver: fix potential buffer overflow, based on wrong fscanf format indentifier. 
Fixed Ticket1780

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-02 22:59:03 +02:00
Michael Niedermayer 032ba74ed2 Merge remote-tracking branch 'qatar/master' 
* 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>
 2012-10-02 19:48:54 +02:00