RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
58,414 Commits 37 Branches 400 Tags 277 MiB
Commit Graph

34 Commits

Author SHA1 Message Date
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
Michael Niedermayer 8c6ebab747 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (26 commits)
  eac3dec: replace undefined 1<<31 with INT32_MIN in noise generation
  yadif: specify array size outside DECLARE_ALIGNED
  prores: specify array size outside DECLARE_ALIGNED brackets.
  WavPack demuxer: set packet duration
  tta: use skip_bits_long()
  mxfdec: Ignore the last entry in Avid's index table segments
  mxfdec: Sanity-check SampleRate
  mxfdec: Handle small EditUnitByteCount
  mxfdec: Consider OPAtom files that do not have exactly one EC to be OP1a
  mxfdec: Don't crash in mxf_packet_timestamps() if current_edit_unit overflows
  mxfdec: Zero nb_ptses in mxf_compute_ptses_fake_index()
  mxfdec: Sanity check PreviousPartition
  mxfdec: Never seek back in local sets and KLVs
  mxfdec: Move the current_partition check inside mxf_read_header()
  mxfdec: Fix infinite loop in mxf_packet_timestamps()
  mxfdec: Check eof_reached in mxf_read_local_tags()
  mxfdec: Check for NULL component
  mxfdec: Make sure mxf->nb_index_tables > 0 in mxf_packet_timestamps()
  mxfdec: Make sure x < index_table->nb_ptses
  build: Add missing directories to DIRS declarations.
  ...

Conflicts:
	doc/build_system.txt
	doc/fate.texi
	libavfilter/x86/yadif_template.c
	libavformat/mxfdec.c
	libavutil/Makefile
	tests/fate/audio.mak
	tests/fate/prores.mak
	tests/fate/screen.mak
	tests/fate/video.mak
	tests/ref/fate/bethsoft-vid
	tests/ref/fate/cscd
	tests/ref/fate/dfa4
	tests/ref/fate/nuv
	tests/ref/fate/vp8-sign-bias
	tests/ref/fate/wmv8-drm
	tests/ref/lavf/gxf

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-10 01:20:07 +01:00
Anton Khirnov 4d58e4cb4c Rename ffserver to avserver. 2011-08-09 19:56:25 +02:00
Johan Andersson 21de920472 Update the url to the site website and change ffmpeg-devel to libav-devel 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-13 18:45:29 -04:00
Howard Chu 8190f62f9b Support presets in ffserver.conf 
Originally committed as revision 23524 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-08 09:55:30 +00:00
Stefano Sabatini 1c9ff17920 Make the maximum number of simultaneous HTTP connections handled by 
ffserver a configuration parameter. The name of the new parameter
introduced is MaxHTTPConnections.

Originally committed as revision 15182 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-03 18:16:34 +00:00
Stefano Sabatini 7fc332c7ba Remove reference to the unsupported master format from ffserver.conf. 
Originally committed as revision 14675 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-09 12:52:23 +00:00
Benoit Fouet 7d88b5ca02 more format abbreviations 
Originally committed as revision 8798 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-24 11:45:13 +00:00
Diego Biurrun 115329f160 COSMETICS: Remove all trailing whitespace. 
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-17 18:14:38 +00:00
Alex Beregszaszi 6b0bdc754b support for unlimited feed size 
Originally committed as revision 4697 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-11-13 03:26:43 +00:00
Alex Beregszaszi ac6a655b8a Make Launch more appropriate with support for full paths for the ffmpeg binary 
Originally committed as revision 4693 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-11-13 01:45:13 +00:00
Alex Beregszaszi 97246091a5 strict -1 is mandatory for jpegs because the colorspace thingie, this should be handled in a better way though 
Originally committed as revision 4691 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-11-13 01:30:20 +00:00
Diego Biurrun f5f30f1bce Talk of MPEG-4 instead of DivX. 
Originally committed as revision 4373 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-06-11 15:56:19 +00:00
Diego Biurrun a2632fd268 consistent spelling 
Originally committed as revision 4372 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-06-10 10:26:44 +00:00
Diego Biurrun 2adf848227 spelling fixes suggested by the Wanderer 
Originally committed as revision 4369 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-06-09 20:02:57 +00:00
Diego Biurrun ed815ddb85 spelling/grammar/wording 
Originally committed as revision 4364 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-06-09 19:23:14 +00:00
Alex Beregszaszi 67c311fafa changed the mailinglist pointers to the new place (mplayerhq) 
Originally committed as revision 4122 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-04-11 16:24:58 +00:00
Panagiotis Issaris d4d1de91a7 vbv size for ffserver.conf patch by (Panagiotis Issaris <takis [] lumumba*luc*ac*be>) 
Originally committed as revision 3780 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-29 22:52:33 +00:00
Fabrice Bellard 6a6362f088 incorrect comment 
Originally committed as revision 2068 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-07-22 12:30:38 +00:00
Fabrice Bellard 7de5459d0a mention the two asf formats 
Originally committed as revision 2067 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-07-22 12:23:32 +00:00
Philip Gladstone 41fc0dd5a3 Have the test.asf stream enabled by default (thanks to htz@kde.org) 
Originally committed as revision 1943 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-06-10 01:26:29 +00:00
Philip Gladstone e322ea480b * Add Video4MotionVector in a stream description to behave like the -4mv flag 
* Add ReadOnlyFile which behaves like File, but does not permit changing of the
  file. This can be used to prevent deleting of saved ffm files.

Originally committed as revision 1743 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-04-09 02:16:01 +00:00
Philip Gladstone 34d7008db0 Applied Mark Hill's patches. 
Originally committed as revision 1356 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-12-21 20:43:40 +00:00
Fabrice Bellard 6891b9d458 added example to hack with SDP/multicast streaming 
Originally committed as revision 1261 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-11-20 18:26:32 +00:00
Philip Gladstone a28d4f86af Add some examples of using ACL 
Originally committed as revision 822 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-07-27 03:03:44 +00:00
Fabrice Bellard bc4a1ffe96 added 'NoDaemon' command - added RTP/RTSP stream example 
Originally committed as revision 813 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-07-25 17:09:20 +00:00
Philip Gladstone e4c47db44b Add the copyright/comment/author/title keywords 
Originally committed as revision 665 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-06-05 02:19:45 +00:00
Philip Gladstone 4e33b83b18 Added Launch, FaviconURL and Redirect examples 
Originally committed as revision 631 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-05-30 02:54:25 +00:00
Philip Gladstone abb2a5e242 Added use of StartSendOnKey 
Originally committed as revision 508 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-05-17 01:54:14 +00:00
Philip Gladstone 9cfe269e70 * Updated with new stream configuration items 
Originally committed as revision 502 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-05-16 02:03:34 +00:00
Philip Gladstone f359a5bed8 * Updated so that some streams actually work! 
Originally committed as revision 456 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-05-09 01:11:49 +00:00
Fabrice Bellard 85f07f223d merge 
Originally committed as revision 6 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2001-07-22 14:37:44 +00:00
Fabrice Bellard 1b58d58dda removing old files 
Originally committed as revision 4 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2001-07-19 20:46:37 +00:00
Fabrice Bellard 9aeeeb63f7 Initial revision 
Originally committed as revision 2 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2000-12-20 00:02:47 +00:00