Statistics
| Branch: | Revision:

ffmpeg / ffserver.c @ 831ec935

History | View | Annotate | Download (148 KB)

# Date Author Comment
2dae1dd0 06/01/2008 02:01 AM Baptiste Coudurier

add \n to error message

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

180b7026 05/30/2008 05:53 PM Baptiste Coudurier

2nd try fix got_key_frame when video+audio

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

78728064 05/30/2008 02:32 AM Baptiste Coudurier

fix got_key_frame when stream is audio

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

0332f549 05/30/2008 02:26 AM Baptiste Coudurier

set got_key_frame when packet is video, fix first video packet with index 0 and 2 streams

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

3766ed72 05/30/2008 01:46 AM Baptiste Coudurier

log error when writing frame to output

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

c1593d0e 05/30/2008 01:46 AM Baptiste Coudurier

wake up connections to stop waiting when feed is being closed

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

084a8912 05/30/2008 01:44 AM Baptiste Coudurier

fix timestamps rescaling, index in source format might be different

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

929a9b75 05/30/2008 12:50 AM Baptiste Coudurier

log some errors

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

58bd615f 05/30/2008 12:21 AM Baptiste Coudurier

set is_streamed before writing data to output file

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

3b371676 05/29/2008 11:11 PM Baptiste Coudurier

cosmetics, reindent

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

1cb4d12c 05/29/2008 11:09 PM Baptiste Coudurier

cosmetics, move declaration where it is used, remove now useless block

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

36907468 05/29/2008 05:24 PM Baptiste Coudurier

use av_parse_video_frame_rate

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

1ab05d37 05/29/2008 03:13 PM Diego Biurrun

Remove unnecessary #include.

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

f094b662 05/29/2008 01:40 PM Erik Hovland

Remove unnecessary header #includes.
Extracted from a patch by Erik Hovland, erik hovland org.

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

ea9c581f 05/29/2008 08:48 AM Stefano Sabatini

Simplify show_banner() so that it does not require arguments, similar
to what was previously done with show_version().
patch by Stefano Sabatini, stefano.sabatini-lala poste it

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

9667a2d2 05/29/2008 02:32 AM Baptiste Coudurier

reindent

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

a9c1bb71 05/29/2008 02:31 AM Baptiste Coudurier

check that redirect is set, fixes CID13 RUN2

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

7e183a93 05/29/2008 02:29 AM Baptiste Coudurier

reindent

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

ce651af2 05/29/2008 02:28 AM Baptiste Coudurier

check that stream is set, fixes CID13 RUN2

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

5735f6dc 05/29/2008 02:11 AM Baptiste Coudurier

check if stream has been set, fixes CID15 RUN2

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

75480e86 05/29/2008 01:59 AM Baptiste Coudurier

init h, fixes CID54 RUN2

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

3fb53d55 05/28/2008 05:04 PM Baptiste Coudurier

remove dummy coded frame, no muxer should use it anyway

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

c351cc7f 05/25/2008 12:12 AM Baptiste Coudurier

better error message

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

f61d45c9 05/24/2008 02:34 AM Baptiste Coudurier

better error message

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

1692008f 05/24/2008 02:19 AM Baptiste Coudurier

latest libavc svn requires at least this value for bit_rate_tolerance, not using av_q2d because of float

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

f346033e 05/23/2008 07:14 AM Stefano Sabatini

Add -formats option to ffserver.
Patch by Stefano Sabatini stefano sabatini-lala poste it

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

8117c97e 05/22/2008 09:48 AM Stefano Sabatini

Implement ffserver -version.
Patch by: Stefano Sabatini, stefano.sabatini-lala poste it

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

20176cbc 05/21/2008 11:41 PM Michael Niedermayer

Get rid of more senseless wrapper functions and use OPT_EXIT instead.

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

64555bd9 05/21/2008 11:36 PM Michael Niedermayer

Do not pass program_name as argument to show_version(), this allows some
future simplifications.

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

c4355f4e 05/21/2008 08:56 PM Baptiste Coudurier

open logfile in append mode, don't overwrite it

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

8a0b55ff 05/21/2008 08:50 PM Baptiste Coudurier

do not forget to free packet, fix memleak

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

5a635bc7 05/21/2008 05:55 PM Stefano Sabatini

Make ffserver use parse_options().
Patch by Stefano Sabatini stefano sabatini-lala poste it

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

e6375662 05/16/2008 01:22 PM Stefano Sabatini

cosmetics: Make 'ffserver -h' output consistent with other ff* tools.
patch by Stefano Sabatini, stefano.sabatini-lala poste it

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

245976da 05/09/2008 11:56 AM Diego Biurrun

Use full path for #includes from another directory.

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

f8cda19e 02/13/2008 12:51 PM Luca Abeni

Include poll.h instead of sys/poll.h

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

815f98cc 02/02/2008 12:54 AM Aurelien Jacobs

non-const 2nd parameter for strtol/strtod

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

8bfb108b 12/21/2007 11:50 AM Diego Biurrun

comment typo fixes

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

17e45b37 12/19/2007 11:29 PM Aurelien Jacobs

pb->buf_end is already set by url_open_buf()

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

562b2163 12/12/2007 06:47 PM Michael Niedermayer

avoid using first_avcodec

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

90901860 12/01/2007 12:19 AM Michael Niedermayer

stupid code (casting of void*) found by checktree.sh

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

93115b82 11/27/2007 11:42 AM Dave Yeo

Add #include "os_support.h" to restore OS/2 support.
patch by Dave Yeo, daveryeo telus net

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

899681cd 11/21/2007 07:41 AM Björn Axelsson

Use dynamically allocated ByteIOContext in AVFormatContext

patch by: Björn Axelsson, bjorn d axelsson a intinor d se
thread: [PATCH] Remove static ByteIOContexts, 06 nov 2007

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

c971ff19 10/29/2007 09:15 AM Luca Abeni

Remove the inclusion of rtsp.h and rtp.h from avformat.h, and
explicitly include such headers where needed

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

8eb1c1cd 09/30/2007 04:09 AM Stefano Sabatini

Remove redundant banner output from ffserver.
patch by Stefano Sabatini, stefano.sabatini-lala poste it
Date: Sat, 29 Sep 2007 13:45:12 +0200
Subject: [FFmpeg-devel] [PATCH] Remove redundant banner output from ffserver

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

3578e9a0 09/28/2007 03:09 PM Stefano Sabatini

Make ffserver show a banner at startup.
Patch by Stefano Sabatini stefano sabatini-lala poste it

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

86074ed1 09/27/2007 06:38 AM Stefano Sabatini

Implement common show version and banner.
Patch by Stefano Sabatini [stefano sabatini-lala poste it]

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

f9436161 09/19/2007 12:38 PM Stefano Sabatini

Make parse_date return INT64_MIN in case of unparsable input.
Patch by Stefano Sabatini: [stefano sabatini-lala poste it]
Original thread:
[FFmpeg-devel] [PATCH] Enhace documentation forlibavformat/utils.c:parse_date
Date: 08/17/2007 09:40 PM

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

25e3e53d 09/17/2007 12:47 PM Luca Abeni

Fix an ffserver crash when a non-existing rtsp: url is requested

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

9dc0bc3d 09/17/2007 07:50 AM Luca Abeni

Use AVFMT_FLAG_GENPTS for the input file (the RTP output format needs all the
PTSs to be set)

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

b156b88c 09/10/2007 10:48 PM Aurelien Jacobs

rtp and rtsp demuxer declarations are not part of public API

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

4ce5df08 08/22/2007 01:10 PM Stefano Sabatini

Make ffserver use cmdutils.c show_license function
patch by Stefano Sabatini: [stefano sabatini minus lala ! poste it]

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

89da5781 08/20/2007 07:17 AM Luca Abeni

Call av_find_stream_info() immediately after opening an input file.
Needed to avoid reading the same TS two times at the beginning of the
file (whic resulted in an "error, non monotone timestamps..." when
streaming RTP from a file)

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

dd723472 08/20/2007 07:07 AM Luca Abeni

Use avf_sdp_create() in ffserver

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

88381412 08/13/2007 08:41 AM Stefano Sabatini

Make ffserver -h exit 0.
patch by Stefano Sabatini, stefano.sabatini-lala poste it

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

5c14a795 08/11/2007 01:11 PM Stefano Sabatini

Make show-license exit 0.
patch by Stefano Sabatini, stefano.sabatini-lala poste it

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

3cf9ea7f 08/08/2007 08:25 PM Alex Beregszaszi

use proper closesocket defines

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

611c5741 08/08/2007 07:40 PM Alex Beregszaszi

cosmetic: remove a huge number of useless braces

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

2d563d2f 08/08/2007 07:23 PM Alex Beregszaszi

cosmetic: simplify some constructs

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

0bd53967 08/08/2007 07:04 PM Alex Beregszaszi

cosmetic: extra space

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

33a4ecbe 08/08/2007 06:56 PM Alex Beregszaszi

cosmetic: indentation

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

eeffbdea 08/08/2007 06:55 PM Alex Beregszaszi

cosmetic: remove extra parenthesis

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

af0f3712 07/13/2007 12:55 AM Alex Beregszaszi

10l to Benoit, poll.h is already included below, and this broke compilation on mingw

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

e5a389a1 07/05/2007 10:40 AM Diego Biurrun

license header consistency cosmetics

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

0f4e8165 07/02/2007 07:43 AM Ronald S. Bultje

to be able to compile without HAVE_AV_CONFIG_H
patch by Ronald S. Bultje: [rsbultje gmail com]
original thread: [FFmpeg-devel] ffmpeg.c/cmdutils.c compilation
date: 06/23/2007 03:15 AM

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

f7d78f36 06/24/2007 11:27 AM Måns Rullgård

replace the uses of old string functions that Reimar missed

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

b33ece16 06/18/2007 08:08 AM Stefano Sabatini

replace calls to deprecated parsing functions to calls to new ones
patch by Stefano Sabatini: [stefano sabatini-lala poste it]

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

755bfeab 06/12/2007 09:29 AM Diego Biurrun

misc spelling fixes

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

364a9607 06/10/2007 02:34 PM Diego Biurrun

Move HAVE_AV_CONFIG_H definition to the Makefile like in the rest of FFmpeg.

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

ba472aaf 04/27/2007 12:41 AM Alex Beregszaszi

implement ff_socket_nonblock and use it in networking code

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

8da4034f 04/27/2007 12:35 AM Alex Beregszaszi

use ff_neterrno() and FF_NETERROR() for networking error handling

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

0bdacf29 04/27/2007 12:17 AM Alex Beregszaszi

use network.h instead network includes

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

4ee10633 04/26/2007 07:27 PM Diego Biurrun

cosmetics: Remove trailing whitespace and tabs.

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

2bd8416e 04/25/2007 10:23 PM Alex Beregszaszi

use resolve_host in acl handlign too, simplificates the code

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

18405874 04/25/2007 10:22 PM Alex Beregszaszi

make the last globals static

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

ad8b8abc 04/25/2007 09:05 PM Alex Beregszaszi

support for hostnames instead ip addresses in ffserver conf (using resolve_host now)

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

57dbe08b 04/24/2007 01:28 PM Luca Abeni

Fix ffserver crash when closing the second RTP session

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

aabce533 04/22/2007 06:06 PM Alex Beregszaszi

check ip port range from config

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

5eb782f0 04/22/2007 06:01 PM Alex Beregszaszi

simplificate

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

cb2abe3f 04/22/2007 05:56 PM Alex Beregszaszi

use av_strdup instead malloc/strcpy

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

d2040a8f 04/22/2007 05:48 PM Alex Beregszaszi

fixed InputFormat option, which was never working

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

0aecfdf9 04/22/2007 03:06 PM Alex Beregszaszi

remove useless code, file removal is handled elsewhere

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

b0b2faa7 04/19/2007 01:55 PM Luca Abeni

Fix an use-after-free bug

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

2c6a5e6c 04/19/2007 01:54 PM Luca Abeni

Remove unused callbacks from ffserver

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

e8d658df 04/10/2007 02:40 PM Luca Abeni

Fix the poll() loop (ret == 0 means that a timeout expired, so it must be
handled)

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

7e665cd3 04/10/2007 02:36 PM Luca Abeni

Fix the generation of RTSP reply headers (the "DEF" macro is not used
anymore in rtspcodes.h)

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

6308caca 03/31/2007 04:36 PM Stanislav Brabec

Fix warning:
ffserver.c:4303: warning: 'acl.next' is used uninitialized in this function
patch by Stanislav Brabec, sbrabec suse cz

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

087fa475 03/31/2007 02:39 PM Alex Beregszaszi

fix x-octet-stream mime type

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

65e72261 03/31/2007 02:36 PM Alex Beregszaszi

use av_strdup

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

55d07ba6 03/31/2007 02:34 PM Alex Beregszaszi

remove dead code

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

c367d067 03/27/2007 09:47 PM Michael Niedermayer

prevent exit missuse

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

750f0e1f 03/12/2007 02:17 PM Panagiotis Issaris

Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
which use av_log() for logging instead of fprintf().

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

acdc8520 03/09/2007 11:20 AM Alex Beregszaszi

print codec parameters for audio too

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

d0a5513b 03/06/2007 01:29 PM Alex Beregszaszi

disconnect new feeder if feed is already being received

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

bae79c04 02/24/2007 03:17 AM Alex Beregszaszi

redirect http get requests of / to index.html (note, the http_parse_request may worth a rewrite)

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

c3f58185 02/24/2007 02:39 AM Alex Beregszaszi

store internal timestamps in int64_t instead long

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

f1debfd0 02/24/2007 02:28 AM Alex Beregszaszi

rescale pts/dts for output format

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

f75cdda7 02/24/2007 02:24 AM Alex Beregszaszi

return error if av_write_header failed (it fails on some containers when codec is not supported)

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

638831aa 02/24/2007 02:16 AM Alex Beregszaszi

disconnect client if trailer is sent

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

5400e092 02/22/2007 01:27 PM Alex Beregszaszi

if feeder is disconnected, clear the feed registration, thus a new feeder can connect

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

038a1243 02/22/2007 01:23 PM Alex Beregszaszi

codec_tag settable via VideoTag, and transmit codec_tag in ffm

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