Michael Niedermayer
7b376b398a
Merge remote branch 'qatar/master'
...
* qatar/master:
Handle unicode file names on windows
rtp: Rename the open/close functions to alloc/free
Lowercase all ff* program names.
Refer to ff* tools by their lowercase names.
NOT Pulled Replace more FFmpeg instances by Libav or ffmpeg.
Replace `` by $() syntax in shell scripts.
patcheck: Allow overiding grep program(s) through environment variables.
NOT Pulled Remove stray libavcore and _g binary references.
vorbis: Rename decoder/encoder files to follow general file naming scheme.
aacenc: Fix whitespace after last commit.
cook: Fix small typo in av_log_ask_for_sample message.
aacenc: Finish 3GPP psymodel analysis for non mid/side cases.
Remove RDFT dependency from AAC decoder.
Add some debug log messages to AAC extradata
Fix mov debug (u)int64_t format strings.
bswap: use native types for av_bwap16().
doc: FLV muxing is supported.
applehttp: Handle AES-128 encrypted streams
Add a protocol handler for AES CBC decryption with PKCS7 padding
doc: Mention that DragonFly BSD requires __BSD_VISIBLE set
Conflicts:
ffplay.c
ffprobe.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-24 03:41:22 +02:00
Kirill Gavrilov
b1ac139d89
Handle unicode file names on windows
...
All file names should be in UTF-8 within libavformat.
This is handled by mapping the open() function to an internal one
in os_support.h for windows.
fopen() could be overridden in the same way, but if that would be
used from ffmpeg.c, it would add a dependency on an ff prefixed
internal lavf function.
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-04-24 00:05:38 +03:00
Mans Rullgard
2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
Max Shakhmetov
a41aebf153
os_support: fix poll() implementation
...
Our poll implementation does not iterate over the pollfd array properly
while setting the revents.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 9ac2085dbf
)
2011-02-16 23:00:49 +01:00
Max Shakhmetov
9ac2085dbf
os_support: fix poll() implementation
...
Our poll implementation does not iterate over the pollfd array properly
while setting the revents.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-02-15 18:11:50 +01:00
Mans Rullgard
13904b552b
os_support: make poll() fallbacks conditional on CONFIG_NETWORK
...
poll() is only used by networking code, so the fallback should
only be built if networking is enabled. Also remove CONFIG_FFSERVER
condition from the declarations.
This should fix building on systems without poll(), broken
by a8475bbdb6
.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 362d8f7d9e
)
2011-01-30 03:41:00 +01:00
Luca Barbato
d0eb91ad04
os: replace select with poll
...
Select has limitations on the fd values it could accept and silently
breaks when it is reached.
(cherry picked from commit a8475bbdb6
)
2011-01-30 03:40:59 +01:00
Mans Rullgard
362d8f7d9e
os_support: make poll() fallbacks conditional on CONFIG_NETWORK
...
poll() is only used by networking code, so the fallback should
only be built if networking is enabled. Also remove CONFIG_FFSERVER
condition from the declarations.
This should fix building on systems without poll(), broken
by a8475bbdb6
.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-28 17:23:19 +00:00
Luca Barbato
a8475bbdb6
os: replace select with poll
...
Select has limitations on the fd values it could accept and silently
breaks when it is reached.
2011-01-28 15:45:19 +01:00
Måns Rullgård
7fddac9320
os_support: include some headers only when needed
...
Originally committed as revision 24072 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-06 11:42:52 +00:00
Måns Rullgård
22f73dccad
Move resolve_host() to ffserver.c
...
This deprecated function is only used by ffserver, yet does not have
a prototype visible there.
In the long term, ffserver should be made IPv6-aware. In the meantime,
this change removes cruft from lavf and fixes some warnings in ffserver.
Originally committed as revision 22329 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 18:43:27 +00:00
David Conrad
38c3b6e73e
inet_aton needs _DARWIN_C_SOURCE on OS X
...
Originally committed as revision 22285 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-07 19:49:02 +00:00
David Conrad
ac11d562e5
Localize the #define _SVID_SOURCE needed for inet_aton() to os_support.c
...
Originally committed as revision 22284 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-07 19:48:59 +00:00
Reimar Döffinger
a34fc5e23d
Make our getaddrinfo implementation initialize "struct addrinfo" return
...
value to NULL on errors.
Originally committed as revision 22122 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-28 22:31:17 +00:00
Ronald S. Bultje
04a2b04b98
Implement gai_strerror() for systems lacking such functionality. Patch
...
by KO Myung-Hun <komh challion net>.
Originally committed as revision 21692 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-08 18:48:12 +00:00
Martin Storsjö
6023d84a2b
Load the proper getaddrinfo functions from ws2_32.dll, if they're present.
...
Patch by Martin Storsjö <martin at martin dot st>.
Originally committed as revision 21443 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-25 01:28:01 +00:00
Martin Storsjö
5d629b72cb
Provide a fallback for getnameinfo() also. Patch by Martin Storsjö
...
<$firstname()$firstname,st>.
Originally committed as revision 21150 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-11 17:45:17 +00:00
Martin Storsjö
fa053ca725
Provide fallback implementations of getaddrinfo() and freeaddrinfo().
...
Patch by Martin Storsjö <$firstname()$firstname,st>.
Originally committed as revision 21145 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-11 17:27:07 +00:00
Ronald S. Bultje
7e43f74a37
Use getaddrinfo(), if available, in resolve_host(). Patch by Martin
...
Storsjö <$firstname()$firstname,st>.
Originally committed as revision 21143 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-11 17:14:16 +00:00
Martin Storsjö
b827f4eb47
Currently, the replacement which is used if inet_aton isn't available,
...
only works correctly on little-endian. The attached patch makes it endian
independent.
Patch by Martin Storsjö <$firstname()$firstname,st>.
Originally committed as revision 21080 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-08 00:04:23 +00:00
Aurelien Jacobs
b250f9c66d
Change semantic of CONFIG_*, HAVE_* and ARCH_*.
...
They are now always defined to either 0 or 1.
Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-13 23:44:16 +00:00
Dave Yeo
e748e34dd6
struct timeval requires #include <sys/time.h>
...
patch by Dave Yeo daveryeo _at_ telus _dot_ net
Originally committed as revision 14793 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-16 18:39:30 +00:00
Aurelien Jacobs
a964e813a1
use h_addr_list[0] instead of h_addr as this is the posix hostent field name
...
Originally committed as revision 14768 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 22:36:05 +00:00
Aurelien Jacobs
7246177d80
ensure we get explicit definition of various _XOPEN_SOURCE functions we use
...
Originally committed as revision 14766 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 22:01:59 +00:00
Luca Abeni
f8cda19ee6
Include poll.h instead of sys/poll.h
...
Originally committed as revision 11924 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-13 12:51:14 +00:00
Michael Kostylev
81644c2ee0
Check for the presence of sys/select.h and conditionally #include it.
...
patch by Michael Kostylev, mik niipt ru
Originally committed as revision 11324 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-27 01:38:50 +00:00
Tom Harper
72d6b1bf1b
Fix compilation of os_support.c for MinGW with --disable-network
...
Patch by Tom Harper <d.thomas.harper <at> gmail.com>
Originally committed as revision 11200 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-09 14:39:01 +00:00
Luca Abeni
087b327287
Include os_support.h only when needed
...
Originally committed as revision 11073 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-21 16:33:06 +00:00
Ramiro Polla
6ff3f3e7ce
Check for winsock2.h instead of __MINGW32__
...
Originally committed as revision 9988 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-08 19:18:10 +00:00
Benoit Fouet
d72e7d0f24
use sscanf to parse address
...
Originally committed as revision 9756 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-19 10:48:50 +00:00
Benoit Fouet
109d30e9f1
remove useless check
...
Originally committed as revision 9733 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-18 11:56:36 +00:00
Joakim Plate
104d04182d
fix emulated inet_aton so that it fails for invalid addresses
...
patch by elupus: \elupus ecce se/
original thread:
[FFmpeg-devel] [PATCH] emulated inet_aton doesn't fail for invalidaddresses
date: 07/15/2007 12:40 AM
Originally committed as revision 9731 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-18 07:57:26 +00:00
Ramiro Polla
1fc44ed69e
MinGW has those include files.
...
Originally committed as revision 9707 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-16 20:30:28 +00:00
Ramiro Polla
82e4ac2c97
Move av_gettime() back to lavf/utils.c
...
Originally committed as revision 9706 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-16 20:28:43 +00:00
Ramiro Polla
c993a83131
MinGW has gettimeofday() since mingw-runtime-3.10
...
Originally committed as revision 9705 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-16 20:27:16 +00:00
Ramiro Polla
7c37e504f0
Remove OS/2 support
...
Originally committed as revision 9586 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-10 21:52:04 +00:00
Ramiro Polla
45c1011020
Remove localtime_r implementation for systems that don't have it.
...
It is no longer used.
Originally committed as revision 9425 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-25 16:18:28 +00:00
Alex Beregszaszi
3e2e29fb00
r9095 invalidly removed the check for non-winsock
...
Originally committed as revision 9096 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-21 16:08:03 +00:00
Alex Beregszaszi
7235183df9
fix FD_SETSIZE handling in our poll() emulation
...
Originally committed as revision 9095 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-21 15:54:35 +00:00
Alex Beregszaszi
5676d140a9
initial mingw networking support
...
Originally committed as revision 9029 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-15 14:58:30 +00:00
Alex Beregszaszi
ba472aaf01
implement ff_socket_nonblock and use it in networking code
...
Originally committed as revision 8846 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-27 00:41:50 +00:00
Diego Biurrun
4ee10633d2
cosmetics: Remove trailing whitespace and tabs.
...
Originally committed as revision 8838 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-26 19:27:32 +00:00
Alex Beregszaszi
383eda2348
move resolve_host from tcp.c to os_support.c as it is used widely
...
Originally committed as revision 8834 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-26 18:04:42 +00:00
Alex Beregszaszi
61bc79ec9c
remove possibly broken wince cruft
...
Originally committed as revision 8763 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-20 23:45:53 +00:00
François Revol
c9fdab0dab
Some more BeOS cleanup: check for arpa/inet.h; declare the prototype for inet_aton if not found; remove barpainet.h as it's not longer needed.
...
Originally committed as revision 8488 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-23 22:01:37 +00:00
François Revol
457b101e42
Make sure we don't try to emulate poll() when it's there if --disable-ffserver... 10l
...
Originally committed as revision 7991 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-15 15:39:39 +00:00
François Revol
36c07acd59
MinGW patch by <koyama AT infocity DOT co DOT jp>, reworked. Removed placeholder for winsock.
...
Originally committed as revision 7990 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-15 13:32:06 +00:00
François Revol
b0c858d834
poll() emulation for BeOS, and maybe MinGW.
...
Originally committed as revision 7987 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-15 07:44:10 +00:00
Måns Rullgård
8da9266cea
use the standard INT64_C() macro for 64-bit constants
...
Originally committed as revision 7240 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-06 23:46:11 +00:00
Diego Biurrun
eaa53b957b
MinGW compilation fix, inet_aton and #includes depend on networking support.
...
Originally committed as revision 7081 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-15 01:11:33 +00:00