1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Commit Graph

11 Commits

Author SHA1 Message Date
Michael Niedermayer
c88caa522c Merge remote branch 'qatar/master'
* qatar/master:
  proto: include os_support.h in network.h
  matroskaenc: don't write an empty Cues element.
  lavc: add a FF_API_REQUEST_CHANNELS deprecation macro
  avio: move extern url_interrupt_cb declaration from avio.h to url.h
  avio: make av_register_protocol2 internal.
  avio: avio_ prefix for url_set_interrupt_cb.
  avio: AVIO_ prefixes for URL_ open flags.
  proto: introduce listen option in tcp
  doc: clarify configure features
  proto: factor ff_network_wait_fd and use it on udp

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-08 02:50:13 +02:00
Luca Barbato
a013291d26 doc: clarify configure features
This way people will not get surprises regarding the current configure
behaviour and contributors will have a guideline on what is expected.
2011-04-07 02:54:12 +02:00
Michael Niedermayer
c0b1bc8d17 Revert "partially rename FFmpeg to Libav"
This reverts commit 070c5d0f35.
2011-03-17 17:26:45 +01:00
Janne Grunau
070c5d0f35 partially rename FFmpeg to Libav
update mailing list references and irc channels in configure
2011-03-16 21:54:39 +01:00
Diego Biurrun
3d4fc61064 Clarify that we require GNU make 3.81+.
Originally committed as revision 15796 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-08 19:47:10 +00:00
Diego Biurrun
1f56021a3d We require GNU Make 3.81.
Originally committed as revision 12829 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-15 06:53:15 +00:00
Diego Biurrun
6dffc88d99 spelling/wording/grammar and better phrasing
Originally committed as revision 12828 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-14 23:51:10 +00:00
Dieter
b7d690f89d Use gmake instead of make on *BSD.
patch by Dieter, freebsd ^^at^^ sopwith ^^dot^^ solgatos ^^dot^^ com

Originally committed as revision 4936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-04 11:37:41 +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
Fabrice Bellard
23642d8e54 add more info about new configure features
Originally committed as revision 583 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-25 22:21:14 +00:00
Fabrice Bellard
de6d9b6404 Initial revision
Originally committed as revision 5 to svn://svn.ffmpeg.org/ffmpeg/trunk
2001-07-22 14:18:56 +00:00