Statistics
| Branch: | Revision:

ffmpeg / ffserver.c @ master

History | View | Annotate | Download (155 KB)

# Date Author Comment
72153419 05/13/2011 02:40 AM Michael Niedermayer

Merge remote branch 'qatar/master'

  • qatar/master: (33 commits)
    rtpdec_qdm2: Don't try to parse data packet if no configuration is received
    ac3enc: put the counting of stereo rematrixing bits in the same place to make the code easier to understand.
    ac3enc: clean up count_frame_bits() and count_frame_bits_fixed()...
046f081b 05/12/2011 09:41 AM Diego Biurrun

configure: Do not unconditionally add -D_POSIX_C_SOURCE to CPPFLAGS.

Adding _POSIX_C_SOURCE to CPPFLAGS globally produces all sorts of problems
since it causes certain system functions to be hidden on some (BSD) systems.
The solution is to only add the flag on systems that really require it, i.e....

d7e5aeba 04/27/2011 01:51 AM Michael Niedermayer

Merge remote branch 'qatar/master'

  • qatar/master: (23 commits)
    ac3enc: correct the flipped sign in the ac3_fixed encoder
    Eliminate pointless '#if 1' statements without matching '#else'.
    Add AVX FFT implementation.
    Increase alignment of av_malloc() as needed by AVX ASM....
e6ff0648 04/26/2011 06:18 PM Diego Biurrun

Eliminate pointless '#if 1' statements without matching '#else'.

7b376b39 04/24/2011 01:41 AM Michael Niedermayer

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....
89b503b5 04/23/2011 05:12 PM Diego Biurrun

Lowercase all ff* program names.

43fb279f 04/23/2011 05:12 PM Diego Biurrun

Replace more FFmpeg instances by Libav or ffmpeg.

efb5fa79 04/20/2011 02:48 AM Michael Niedermayer

Merge remote branch 'qatar/master'

  • qatar/master: (37 commits)
    In avcodec_open(), set return code to an error value only when an error occurs instead of unconditionally at the start of the function.
    lavc: remove reference to opt.h from Makefile.
    prefer avio_check() over url_exist()...
55815edc 04/19/2011 05:48 PM Stefano Sabatini

prefer avio_check() over url_exist()

The problem with url_exist() is that it tries to open a resource in
RDONLY mode. If the file is a FIFO and there is already a reading
client, the open() call will hang.

By using avio_check() with access mode of 0, the second reading...

59d96941 04/19/2011 05:47 PM Stefano Sabatini

avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbols

Make AVIO_FLAG_ access constants work as flags, and in particular fix
the behavior of functions (such as avio_check()) which expect them to
be flags rather than modes.

This breaks API.

41d0eb1c 04/19/2011 04:41 PM Anton Khirnov

lavc: remove the FF_API_SET_STRING_OLD cruft.

761ad429 04/19/2011 04:28 PM Anton Khirnov

lavf: remove FF_API_MAX_STREAMS cruft

d4d09329 04/09/2011 01:17 AM Michael Niedermayer

Merge remote branch 'qatar/master'

  • qatar/master:
    lavf: bump minor and add an APIChanges entry for avformat cleanup
    lavf: get rid of ffm-specific stuff in avformat.h
    Not pulled: avio: deprecate av_protocol_next().
    avio: add a function for iterating though protocol names....
3ee53dab 04/08/2011 06:58 PM Anton Khirnov

lavf: get rid of ffm-specific stuff in avformat.h

c3675dfe 04/08/2011 02:45 PM Anton Khirnov

lavf: rename avf_sdp_create to av_sdp_create.

The new name is more consistent with the rest of the API.

c88caa52 04/08/2011 12:50 AM Michael Niedermayer

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...
f87b1b37 04/07/2011 04:07 PM Anton Khirnov

avio: AVIO_ prefixes for URL_ open flags.

2cae9809 04/04/2011 12:15 AM Michael Niedermayer

Merge remote branch 'qatar/master'

  • qatar/master:
    fate: fix partial run when no samples path is specified
    ARM: NEON fixed-point forward MDCT
    ARM: NEON fixed-point FFT
    lavf: bump minor version and add an APIChanges entry for avio changes
    avio: simplify url_open_dyn_buf_internal by using avio_alloc_context()...
403ee835 04/03/2011 08:47 PM Anton Khirnov

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 be
cleaned up when somebody is up for it.

6dc7d80d 04/03/2011 08:47 PM Anton Khirnov

avio: avio_ prefix for url_close_dyn_buf

b92c5452 04/03/2011 08:46 PM Anton Khirnov

avio: avio_ prefix for url_open_dyn_buf

8978feda 04/03/2011 08:46 PM Anton Khirnov

avio: introduce an AVIOContext.seekable field

Use it instead of url_is_streamed and AVIOContext.is_streamed.

2912e87a 03/19/2011 01:33 PM Mans Rullgard

Replace FFmpeg with Libav in licence headers

Signed-off-by: Mans Rullgard <>

83fddaeb 03/17/2011 02:59 AM Anton Khirnov

avio: deprecate url_open_buf

It's only used in one place and does the same thing as
avio_alloc_context.

Signed-off-by: Ronald S. Bultje <>

d9d86e00 03/17/2011 02:59 AM Anton Khirnov

avio: avio_ prefix for url_fprintf

Signed-off-by: Ronald S. Bultje <>

22a3212e 02/23/2011 03:18 PM Anton Khirnov

avio: rename url_fopen/fclose -> avio_open/close.

Signed-off-by: Ronald S. Bultje <>

28c4741a 02/23/2011 12:21 PM Martin Storsjö

libavformat: Remove FF_NETERRNO()

Map EAGAIN and EINTR from ff_neterrno to the normal AVERROR
error codes. Provide fallback definitions of other errno.h network
errors, mapping them to the corresponding winsock errors.

This eases catching these error codes in common code, without having...

77eb5504 02/21/2011 07:25 PM Anton Khirnov

avio: avio: avio_ prefixes for put_* functions

In the name of consistency:
put_byte -> avio_w8
put_<type> -> avio_w<type>
put_buffer -> avio_write

put_nbyte will be made private
put_tag will be merged with avio_put_str

Signed-off-by: Ronald S. Bultje <>

ae628ec1 02/20/2011 01:37 PM Anton Khirnov

avio: rename ByteIOContext to AVIOContext.

Signed-off-by: Ronald S. Bultje <>

c2ca851b 02/17/2011 10:18 PM Martin Storsjö

ffserver: Try matching the RTSP url without a trailing slash

If the client sends PLAY/PAUSE requests with the same url as
specified in Content-Base, these requests may have urls with
trailing slashes.

ab0287fc 02/17/2011 02:35 PM Anton Khirnov

Move find_info_tag to lavu and add av_ prefix to it

Signed-off-by: Janne Grunau <>

9fcae973 02/16/2011 11:39 PM Anton Khirnov

Replace remaining uses of parse_date with av_parse_time.

Signed-off-by: Mans Rullgard <>

6741f7c9 02/16/2011 11:37 PM Nicolas George

ffserver: set the sample aspect ratio

Hi.

It seems that ffserver sets sample_aspect_ratio to an invalid value and lavf
rejects it.

I am not sure what I am doing here, but the attached patch actually solves
something: using the following config:

CustomLog -...

737eb597 02/15/2011 03:18 PM Reinhard Tartler

Merge libavcore into libavutil

It is pretty hopeless that other considerable projects will adopt
libavutil alone in other projects. Projects that need small footprint
are better off with more specialized libraries such as gnulib or rather
just copy the necessary parts that they need. With this in mind, nobody...

efa6ce99 01/24/2011 10:09 PM Mans Rullgard

ffserver: put gcc attribute under proper ifdef

305ca590 01/23/2011 07:53 AM Reinhard Tartler

ffserver: cleanup

remove the trivial function do_switch_stream as it doesn't help to make
the code easier to understand.

2a127067 01/07/2011 06:48 PM Luca Barbato

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

77223c53 01/02/2011 10:10 AM Martin Storsjö

rtsp: Pass the method name to ff_rtsp_parse_line

Originally committed as revision 26191 to svn://svn.ffmpeg.org/ffmpeg/trunk

6e872935 11/04/2010 11:07 PM Stefano Sabatini

Implement get_preset_file() in cmdutils.h and use it to factorize code
from ffmpeg.c and ffserver.c.

Originally committed as revision 25679 to svn://svn.ffmpeg.org/ffmpeg/trunk

aff88101 10/15/2010 07:09 PM Aurelien Jacobs

ffserver: use a local MAX_STREAMS limit

Originally committed as revision 25495 to svn://svn.ffmpeg.org/ffmpeg/trunk

9389b925 10/15/2010 07:09 PM Aurelien Jacobs

ffserver: fix prepare_sdp_description() to dynamically allocate streams

Originally committed as revision 25494 to svn://svn.ffmpeg.org/ffmpeg/trunk

126b638e 07/26/2010 11:12 PM Stefano Sabatini

Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
in favor of the newly added corresponding functions
av_parse_video_size() and av_parse_video_rate() defined in
libavcore/parseutils.h.

This change also adds a linking-time dependency of libavcodec and of...

0aee2a57 07/08/2010 09:21 AM Howard Chu

Also use 503 for bandwidth limit exceeded

Originally committed as revision 24107 to svn://svn.ffmpeg.org/ffmpeg/trunk

2a22187f 07/08/2010 08:59 AM Howard Chu

Fix "server too busy" status code

Originally committed as revision 24105 to svn://svn.ffmpeg.org/ffmpeg/trunk

f3bfe388 06/27/2010 02:16 PM Måns Rullgård

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

5634f30c 06/22/2010 06:45 AM Martin Storsjö

ffserver: Use avcodec_copy_context instead of manually copying an AVCodecContext

Originally committed as revision 23692 to svn://svn.ffmpeg.org/ffmpeg/trunk

d9aac267 06/16/2010 01:12 AM Howard Chu

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 has
opened the stream.

Originally committed as revision 23621 to svn://svn.ffmpeg.org/ffmpeg/trunk

8190f62f 06/08/2010 09:55 AM Howard Chu

Support presets in ffserver.conf

Originally committed as revision 23524 to svn://svn.ffmpeg.org/ffmpeg/trunk

f475f35f 06/03/2010 08:58 PM Martin Storsjö

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 makes
cur_pts calculated against the same origin for all streams.

Originally committed as revision 23450 to svn://svn.ffmpeg.org/ffmpeg/trunk

3b963552 06/02/2010 07:09 AM Martin Storsjö

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

577ee948 05/25/2010 07:23 PM Martin Storsjö

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

111c9359 05/24/2010 08:24 PM Martin Storsjö

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

a5ba4ced 05/24/2010 08:08 PM Martin Storsjö

ffserver: Fix streaming with more than one stream

Fix by Howard Chu, hyc at highlandsun dot com

Originally committed as revision 23294 to svn://svn.ffmpeg.org/ffmpeg/trunk

e175b55e 05/24/2010 07:59 PM Howard Chu

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

c966c912 05/24/2010 07:23 PM Martin Storsjö

ffserver: Fix an out of bounds read

Fix by Howard Chu, hyc at highlandsun dot com

Originally committed as revision 23292 to svn://svn.ffmpeg.org/ffmpeg/trunk

9cc9a155 05/24/2010 07:12 PM Martin Storsjö

ffserver: Fix another memory leak

Don't allocate st->codec, it will be overwritten by the memcpy a few
lines further down.

Fix by Howard Chu, hyc at highlandsun dot com

Originally committed as revision 23291 to svn://svn.ffmpeg.org/ffmpeg/trunk

ea4f8aab 05/24/2010 07:05 PM Howard Chu

ffserver: Plug some memory leaks

Patch by Howard Chu, hyc at highlandsun dot com

Originally committed as revision 23290 to svn://svn.ffmpeg.org/ffmpeg/trunk

576fb48e 05/23/2010 08:53 AM Martin Storsjö

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 the
next major bump.

Originally committed as revision 23254 to svn://svn.ffmpeg.org/ffmpeg/trunk

686d6f40 05/21/2010 07:59 AM Howard Chu

ffserver: Avoid busylooping while reading non-blocking input

Patch by Howard Chu, hyc at highlandsun dot com

Originally committed as revision 23210 to svn://svn.ffmpeg.org/ffmpeg/trunk

90c92100 05/18/2010 11:46 AM Martin Storsjö

Cosmetics: reindent

Originally committed as revision 23156 to svn://svn.ffmpeg.org/ffmpeg/trunk

1bf5228e 05/18/2010 11:45 AM Howard Chu

ffserver: Don't set me_method unconditionally

Patch by Howard Chu, hyc at highlandsun dot com

Originally committed as revision 23155 to svn://svn.ffmpeg.org/ffmpeg/trunk

0156fcf2 05/18/2010 11:16 AM Howard Chu

ffserver: Write proper GMT date/times in Date headers

Patch by Howard Chu, hyc at highlandsun dot com

Originally committed as revision 23154 to svn://svn.ffmpeg.org/ffmpeg/trunk

43d09faf 05/17/2010 05:34 PM Martin Storsjö

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

2ef6c124 04/25/2010 02:27 PM Stefano Sabatini

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

472e12f5 04/24/2010 10:39 AM Stefano Sabatini

Implement ffserver.c:report_config_error() and a macro for logging
error messages / updating the error count.

Originally committed as revision 22960 to svn://svn.ffmpeg.org/ffmpeg/trunk

6675a5bf 04/24/2010 10:39 AM Stefano Sabatini

Statically initialize ffserver.c:config_filename, simplify.

Originally committed as revision 22959 to svn://svn.ffmpeg.org/ffmpeg/trunk

bacde646 04/19/2010 11:42 AM Luca Barbato

Make ffserver support rfc3550

Originally committed as revision 22907 to svn://svn.ffmpeg.org/ffmpeg/trunk

58f48adb 04/07/2010 08:06 PM Benjamin Larsson

Add DynamicACL support for FFserver.

Originally committed as revision 22815 to svn://svn.ffmpeg.org/ffmpeg/trunk

d9521cb1 03/31/2010 09:02 PM Ronald S. Bultje

Fix FFM-based streaming from ffmpeg to ffserver. The basic problem is that
we'd memset() the codec context to zero, thereby setting audio input to U8
and video to YUV420P. For most video encoders, that actually works, but for
most audio codecs, it doesn't. This patch changes defaults to those set by...

cc947f04 03/31/2010 12:29 PM Jean-Daniel Dupas

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

72415b2a 03/30/2010 11:30 PM Stefano Sabatini

Define AVMediaType enum, and use it instead of enum CodecType, which
is deprecated and will be dropped at the next major bump.

Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk

2626308a 03/25/2010 09:48 PM Martin Storsjö

Actually parse the auth headers in RTSP

Originally committed as revision 22677 to svn://svn.ffmpeg.org/ffmpeg/trunk

22f73dcc 03/08/2010 06:43 PM Måns Rullgård

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....

c5c6e67c 03/08/2010 09:03 AM Martin Storsjö

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

ffabdaa1 03/08/2010 12:26 AM Måns Rullgård

ffserver: remove bogus comment

Originally committed as revision 22303 to svn://svn.ffmpeg.org/ffmpeg/trunk

6580d5e3 03/07/2010 10:18 PM Måns Rullgård

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

acd0026c 03/07/2010 10:18 PM Måns Rullgård

ffserver: do not use intreadwrite.h

intreadwrite.h is not part of the public API and should thus
not be used by the ff* applications.

Originally committed as revision 22293 to svn://svn.ffmpeg.org/ffmpeg/trunk

fd7bec5e 03/06/2010 07:41 PM Måns Rullgård

ffserver: use av_stristr()

Originally committed as revision 22252 to svn://svn.ffmpeg.org/ffmpeg/trunk

19c8c4ec 03/03/2010 06:41 PM Ronald S. Bultje

Update to work with chunked encoding HTTP streams (as served by FFmpeg since
a few months now). Fixes issue 1738.

Originally committed as revision 22175 to svn://svn.ffmpeg.org/ffmpeg/trunk

3307e6ea 02/23/2010 12:35 AM Ronald S. Bultje

Prefix non-static RTSP functions with ff_.

Originally committed as revision 21974 to svn://svn.ffmpeg.org/ffmpeg/trunk

7f6a384a 01/04/2010 05:55 PM Diego Biurrun

Mark http_log() as static; it is only used in this file.

Originally committed as revision 21017 to svn://svn.ffmpeg.org/ffmpeg/trunk

aa13b573 01/01/2010 11:56 PM Stefano Sabatini

Use av_match_ext() in place of the deprecated match_ext() function.

Originally committed as revision 21000 to svn://svn.ffmpeg.org/ffmpeg/trunk

0f52ef1a 01/01/2010 12:58 PM Stefano Sabatini

Use av_guess_format() in place of the deprecated guess_format().

Originally committed as revision 20994 to svn://svn.ffmpeg.org/ffmpeg/trunk

1642ee43 12/31/2009 02:12 PM Stefano Sabatini

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 undocumented
properties of the name of the muxers (wich is currently only relevant...

992f8eae 11/29/2009 11:12 PM Stefano Sabatini

Factorize common commandline options definition.

Originally committed as revision 20664 to svn://svn.ffmpeg.org/ffmpeg/trunk

8447f0bd 11/19/2009 04:35 PM Michael Niedermayer

Split show_formats().

Originally committed as revision 20553 to svn://svn.ffmpeg.org/ffmpeg/trunk

43d160fd 10/02/2009 07:06 PM Stefano Sabatini

Prefer "loglevel" over "logging level number or string" as argname of
the loglevel command line option.

Make the loglevel option help message more clear, since the option
argument is shown as a single token, and make the whole message better
aligned with the other help messages....

a392f82a 09/29/2009 09:08 PM Diego Biurrun

Remove disabled code cruft.

Originally committed as revision 20087 to svn://svn.ffmpeg.org/ffmpeg/trunk

7087a0f5 09/26/2009 11:30 PM Stefano Sabatini

Add a -loglevel command line option to ffserver.

The -loglevel option makes possible to set the logging level used by
the libav* libraries.

Originally committed as revision 20035 to svn://svn.ffmpeg.org/ffmpeg/trunk

c64c0a9b 09/10/2009 07:08 PM Benjamin Larsson

Move get_arg to avoid future declaration of function when
new code is added.

Originally committed as revision 19815 to svn://svn.ffmpeg.org/ffmpeg/trunk

5e567aae 07/19/2009 10:44 AM Diego Biurrun

Consistently lowercase all HTML tags.

Originally committed as revision 19464 to svn://svn.ffmpeg.org/ffmpeg/trunk

64159a58 03/21/2009 10:32 AM Baptiste Coudurier

check if feed max file size is too small

Originally committed as revision 18109 to svn://svn.ffmpeg.org/ffmpeg/trunk

1f611549 03/21/2009 10:29 AM Baptiste Coudurier

cosmetics, reindent and remove empty line

Originally committed as revision 18108 to svn://svn.ffmpeg.org/ffmpeg/trunk

861ec13a 03/21/2009 10:28 AM Baptiste Coudurier

new Truncate option which will make feeder truncate feed file

Originally committed as revision 18107 to svn://svn.ffmpeg.org/ffmpeg/trunk

85fe4ae0 03/21/2009 09:58 AM Baptiste Coudurier

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

0bdd8b85 03/21/2009 09:56 AM Baptiste Coudurier

send busy reply if max connections number is exceeded

Originally committed as revision 18103 to svn://svn.ffmpeg.org/ffmpeg/trunk

7e24aa0c 03/21/2009 06:52 AM Baptiste Coudurier

adjust write index if not set

Originally committed as revision 18097 to svn://svn.ffmpeg.org/ffmpeg/trunk

20f93c3c 03/20/2009 01:07 AM Baptiste Coudurier

check av_find_stream_info return value

Originally committed as revision 18060 to svn://svn.ffmpeg.org/ffmpeg/trunk

77553ae3 03/20/2009 01:05 AM Baptiste Coudurier

uniformize log messages and add some more

Originally committed as revision 18059 to svn://svn.ffmpeg.org/ffmpeg/trunk

042819c5 03/20/2009 01:00 AM Baptiste Coudurier

use lfg and ff_random_get_seed instead of deprecated av_random

Originally committed as revision 18058 to svn://svn.ffmpeg.org/ffmpeg/trunk