History | View | Annotate | Download (155 KB)
Merge remote branch 'qatar/master'
Eliminate pointless '#if 1' statements without matching '#else'.
Lowercase all ff* program names.
Replace more FFmpeg instances by Libav or ffmpeg.
prefer avio_check() over url_exist()
The problem with url_exist() is that it tries to open a resource inRDONLY mode. If the file is a FIFO and there is already a readingclient, the open() call will hang.
By using avio_check() with access mode of 0, the second reading...
avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbols
Make AVIO_FLAG_ access constants work as flags, and in particular fixthe behavior of functions (such as avio_check()) which expect them tobe flags rather than modes.
This breaks API.
lavc: remove the FF_API_SET_STRING_OLD cruft.
lavf: remove FF_API_MAX_STREAMS cruft
lavf: get rid of ffm-specific stuff in avformat.h
lavf: rename avf_sdp_create to av_sdp_create.
The new name is more consistent with the rest of the API.
avio: AVIO_ prefixes for URL_ open flags.
avio: make url_open_dyn_packet_buf internal.
It doesn't look fit to be a part of the public API.
Adding a temporary hack to ffserver to be able to use it, should becleaned up when somebody is up for it.
avio: avio_ prefix for url_close_dyn_buf
avio: avio_ prefix for url_open_dyn_buf
avio: introduce an AVIOContext.seekable field
Use it instead of url_is_streamed and AVIOContext.is_streamed.
Replace FFmpeg with Libav in licence headers
Signed-off-by: Mans Rullgard <mans@mansr.com>
avio: deprecate url_open_buf
It's only used in one place and does the same thing asavio_alloc_context.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
avio: avio_ prefix for url_fprintf
avio: rename url_fopen/fclose -> avio_open/close.
libavformat: Remove FF_NETERRNO()
Map EAGAIN and EINTR from ff_neterrno to the normal AVERRORerror codes. Provide fallback definitions of other errno.h networkerrors, mapping them to the corresponding winsock errors.
This eases catching these error codes in common code, without having...
avio: avio: avio_ prefixes for put_* functions
In the name of consistency:put_byte -> avio_w8put_<type> -> avio_w<type>put_buffer -> avio_write
put_nbyte will be made privateput_tag will be merged with avio_put_str
avio: rename ByteIOContext to AVIOContext.
ffserver: Try matching the RTSP url without a trailing slash
If the client sends PLAY/PAUSE requests with the same url asspecified in Content-Base, these requests may have urls withtrailing slashes.
Move find_info_tag to lavu and add av_ prefix to it
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
Replace remaining uses of parse_date with av_parse_time.
ffserver: set the sample aspect ratio
Hi.
It seems that ffserver sets sample_aspect_ratio to an invalid value and lavfrejects it.
I am not sure what I am doing here, but the attached patch actually solvessomething: using the following config:
CustomLog -...
Merge libavcore into libavutil
It is pretty hopeless that other considerable projects will adoptlibavutil alone in other projects. Projects that need small footprintare better off with more specialized libraries such as gnulib or ratherjust copy the necessary parts that they need. With this in mind, nobody...
ffserver: put gcc attribute under proper ifdef
ffserver: cleanup
remove the trivial function do_switch_stream as it doesn't help to makethe code easier to understand.
Unbreak ffserver
Make sure the sample_aspect_ratio is 0 and not 0/0.
Originally committed as revision 26254 to svn://svn.ffmpeg.org/ffmpeg/trunk
rtsp: Pass the method name to ff_rtsp_parse_line
Originally committed as revision 26191 to svn://svn.ffmpeg.org/ffmpeg/trunk
Implement get_preset_file() in cmdutils.h and use it to factorize codefrom ffmpeg.c and ffserver.c.
Originally committed as revision 25679 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffserver: use a local MAX_STREAMS limit
Originally committed as revision 25495 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffserver: fix prepare_sdp_description() to dynamically allocate streams
Originally committed as revision 25494 to svn://svn.ffmpeg.org/ffmpeg/trunk
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()in favor of the newly added corresponding functionsav_parse_video_size() and av_parse_video_rate() defined inlibavcore/parseutils.h.
This change also adds a linking-time dependency of libavcodec and of...
Also use 503 for bandwidth limit exceeded
Originally committed as revision 24107 to svn://svn.ffmpeg.org/ffmpeg/trunk
Fix "server too busy" status code
Originally committed as revision 24105 to svn://svn.ffmpeg.org/ffmpeg/trunk
Make ff_url_split() public
ff_url_split() is retained as an alias, as it was used by ffserver,to avoid breaking ABI compatibility with it.
Originally committed as revision 23822 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffserver: Use avcodec_copy_context instead of manually copying an AVCodecContext
Originally committed as revision 23692 to svn://svn.ffmpeg.org/ffmpeg/trunk
When reading a stream, should retry on EAGAIN instead of just failing. Also,when reading a live feed, should retry regardless of whether any client hasopened the stream.
Originally committed as revision 23621 to svn://svn.ffmpeg.org/ffmpeg/trunk
Support presets in ffserver.conf
Originally committed as revision 23524 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffserver: Calculate cur_pts using first_pts as origin instead of ist->start_time
This fixes cases where ist->start_time wasn't initialized. This also makescur_pts calculated against the same origin for all streams.
Originally committed as revision 23450 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffserver: Allow floating point audio bit rates
This allows setting bit rates that aren't an exact multiple of 1000.
Originally committed as revision 23419 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffserver: Send a Content-Base header in the reply to RTSP DESCRIBE requests
This is needed for QuickTime Player to be able to connect properly.
Originally committed as revision 23325 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffserver: Fix one of the codec parameter checks
This is probably what was originally intended; the codec pointers are all NULL.
Fix by Howard Chu, hyc at highlandsun dot com
Originally committed as revision 23295 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffserver: Fix streaming with more than one stream
Originally committed as revision 23294 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffserver: Fix extradata handling
Patch by Howard Chu, hyc at highlandsun dot com
Originally committed as revision 23293 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffserver: Fix an out of bounds read
Originally committed as revision 23292 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffserver: Fix another memory leak
Don't allocate st->codec, it will be overwritten by the memcpy a fewlines further down.
Originally committed as revision 23291 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffserver: Plug some memory leaks
Originally committed as revision 23290 to svn://svn.ffmpeg.org/ffmpeg/trunk
Make ff_random_get_seed public, rename to av_get_random_seed, export the header
Keep an old ff_ named function for binary compatibility until thenext major bump.
Originally committed as revision 23254 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffserver: Avoid busylooping while reading non-blocking input
Originally committed as revision 23210 to svn://svn.ffmpeg.org/ffmpeg/trunk
Cosmetics: reindent
Originally committed as revision 23156 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffserver: Don't set me_method unconditionally
Originally committed as revision 23155 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffserver: Write proper GMT date/times in Date headers
Originally committed as revision 23154 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffserver: Make sure a destination URL is set when creating the SDP
Debugged by Howard Chu, hyc at highlandsun dot com.
Originally committed as revision 23151 to svn://svn.ffmpeg.org/ffmpeg/trunk
Mark av_metadata_set() as deprecated, and use av_metadata_set2()in its place.
av_metadata_set() is going to be dropped at the next major bump.
Originally committed as revision 22961 to svn://svn.ffmpeg.org/ffmpeg/trunk
Implement ffserver.c:report_config_error() and a macro for loggingerror messages / updating the error count.
Originally committed as revision 22960 to svn://svn.ffmpeg.org/ffmpeg/trunk
Statically initialize ffserver.c:config_filename, simplify.
Originally committed as revision 22959 to svn://svn.ffmpeg.org/ffmpeg/trunk
Make ffserver support rfc3550
Originally committed as revision 22907 to svn://svn.ffmpeg.org/ffmpeg/trunk
Add DynamicACL support for FFserver.
Originally committed as revision 22815 to svn://svn.ffmpeg.org/ffmpeg/trunk
Fix FFM-based streaming from ffmpeg to ffserver. The basic problem is thatwe'd memset() the codec context to zero, thereby setting audio input to U8and video to YUV420P. For most video encoders, that actually works, but formost audio codecs, it doesn't. This patch changes defaults to those set by...
Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.
Patch by Jean-Daniel Dupas, devlists shadowlab org
Originally committed as revision 22744 to svn://svn.ffmpeg.org/ffmpeg/trunk
Define AVMediaType enum, and use it instead of enum CodecType, whichis deprecated and will be dropped at the next major bump.
Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
Actually parse the auth headers in RTSP
Originally committed as revision 22677 to svn://svn.ffmpeg.org/ffmpeg/trunk
Move resolve_host() to ffserver.c
This deprecated function is only used by ffserver, yet does not havea 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....
Rename url_split to ff_url_split
Since this function isn't in the public API, it should have an ff_ prefix.
Originally committed as revision 22321 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffserver: remove bogus comment
Originally committed as revision 22303 to svn://svn.ffmpeg.org/ffmpeg/trunk
Remove hacks not required since HAVE_AV_CONFIG_H was unset for the apps
Originally committed as revision 22295 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffserver: do not use intreadwrite.h
intreadwrite.h is not part of the public API and should thusnot be used by the ff* applications.
Originally committed as revision 22293 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffserver: use av_stristr()
Originally committed as revision 22252 to svn://svn.ffmpeg.org/ffmpeg/trunk
Update to work with chunked encoding HTTP streams (as served by FFmpeg sincea few months now). Fixes issue 1738.
Originally committed as revision 22175 to svn://svn.ffmpeg.org/ffmpeg/trunk
Prefix non-static RTSP functions with ff_.
Originally committed as revision 21974 to svn://svn.ffmpeg.org/ffmpeg/trunk
Mark http_log() as static; it is only used in this file.
Originally committed as revision 21017 to svn://svn.ffmpeg.org/ffmpeg/trunk
Use av_match_ext() in place of the deprecated match_ext() function.
Originally committed as revision 21000 to svn://svn.ffmpeg.org/ffmpeg/trunk
Use av_guess_format() in place of the deprecated guess_format().
Originally committed as revision 20994 to svn://svn.ffmpeg.org/ffmpeg/trunk
Deprecate and mark for deletion the function guess_stream_format(),and clone its code to ffserver_guess_format() in ffserver.c.
guess_stream_format() is hackish since it relies on some undocumentedproperties of the name of the muxers (wich is currently only relevant...
Factorize common commandline options definition.
Originally committed as revision 20664 to svn://svn.ffmpeg.org/ffmpeg/trunk
Split show_formats().
Originally committed as revision 20553 to svn://svn.ffmpeg.org/ffmpeg/trunk
Prefer "loglevel" over "logging level number or string" as argname ofthe loglevel command line option.
Make the loglevel option help message more clear, since the optionargument is shown as a single token, and make the whole message betteraligned with the other help messages....
Remove disabled code cruft.
Originally committed as revision 20087 to svn://svn.ffmpeg.org/ffmpeg/trunk
Add a -loglevel command line option to ffserver.
The -loglevel option makes possible to set the logging level used bythe libav* libraries.
Originally committed as revision 20035 to svn://svn.ffmpeg.org/ffmpeg/trunk
Move get_arg to avoid future declaration of function whennew code is added.
Originally committed as revision 19815 to svn://svn.ffmpeg.org/ffmpeg/trunk
Consistently lowercase all HTML tags.
Originally committed as revision 19464 to svn://svn.ffmpeg.org/ffmpeg/trunk
check if feed max file size is too small
Originally committed as revision 18109 to svn://svn.ffmpeg.org/ffmpeg/trunk
cosmetics, reindent and remove empty line
Originally committed as revision 18108 to svn://svn.ffmpeg.org/ffmpeg/trunk
new Truncate option which will make feeder truncate feed file
Originally committed as revision 18107 to svn://svn.ffmpeg.org/ffmpeg/trunk
do not call av_find_stream_info if stream is ffm, should fix stalling
Originally committed as revision 18104 to svn://svn.ffmpeg.org/ffmpeg/trunk
send busy reply if max connections number is exceeded
Originally committed as revision 18103 to svn://svn.ffmpeg.org/ffmpeg/trunk
adjust write index if not set
Originally committed as revision 18097 to svn://svn.ffmpeg.org/ffmpeg/trunk
check av_find_stream_info return value
Originally committed as revision 18060 to svn://svn.ffmpeg.org/ffmpeg/trunk
uniformize log messages and add some more
Originally committed as revision 18059 to svn://svn.ffmpeg.org/ffmpeg/trunk
use lfg and ff_random_get_seed instead of deprecated av_random
Originally committed as revision 18058 to svn://svn.ffmpeg.org/ffmpeg/trunk
check if feed and stream already exist before registering new one
Originally committed as revision 18057 to svn://svn.ffmpeg.org/ffmpeg/trunk
Bump major version of libavutil due to FIFO fixes.The current API/ABI should not be considered stable yet, further ABI/APIbreakage is possible without major bumps.
Originally committed as revision 17871 to svn://svn.ffmpeg.org/ffmpeg/trunk