Michael Niedermayer
2ec18db75c
ffserver: Replace one malloc(AVStream) by avformat_new_stream()
...
This fixes a null pointer dereference from the recently introduced
AVStream->internal
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Michael Niedermayer
64e220beb5
ffserver: Do not add or rescale AV_NOPTS_VALUE from the demuxer
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Ganesh Ajjanagadde
6c2dbff7f0
ffserver: fix incorrect strlcpy usage
...
Somewhat ironic that this "safe" interface is actually being used
unsafely here. This fixes the usage preventing potential null pointer
dereference, where the old code was doubly broken: ctime can return
NULL, and ctime can return an arbitrarily long buffer.
Reviewed-by: Mark Harris <mark.hsj@gmail.com>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
9 years ago
Hendrik Leppkes
c2f861ca42
Replace remaining occurances of av_free_packet with av_packet_unref
9 years ago
Reynaldo H. Verdejo Pinochet
fe95b0eb8f
ffserver: avoid leaking pathname at exit
...
Fixes Coverity CID 1325681
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
9 years ago
Reynaldo H. Verdejo Pinochet
84b4998dbd
ffserver: fix up rate units in server messages
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
9 years ago
Reynaldo H. Verdejo Pinochet
d8c714cb24
ffserver: wrap around bandwidth exceeded msg text
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
9 years ago
Reynaldo H. Verdejo Pinochet
8a9089948f
ffserver: wrap around too-busy message text
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
9 years ago
Reynaldo H. Verdejo Pinochet
3388bcced4
ffserver: unify exit path in _write_index()
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
9 years ago
Reynaldo H. Verdejo Pinochet
c677b42f79
ffserver: explicitly free() duped filename
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
9 years ago
Reynaldo H. Verdejo Pinochet
fb349359dc
ffserver: start dropping all unneededly harcoded str lengths
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
9 years ago
Michael Niedermayer
7404f3bdb9
lavc: Switch bitrate to 64bit unless compatibility with avconv was requested.
9 years ago
Reynaldo H. Verdejo Pinochet
314bc20d7a
ffserver: remove redundant comment, clarify another one
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
9 years ago
Reynaldo H. Verdejo Pinochet
2580395e1c
ffserver: unify exit path in http_server()
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
9 years ago
Reynaldo H. Verdejo Pinochet
9a168e9371
ffserver: unify fail path in socket_open_listen()
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
9 years ago
Ganesh Ajjanagadde
92b1a0fa9e
ffserver: cast PID to int64_t before printing
...
Unfortunately, there is no portable format specifier for PID's.
Furthermore, it is not safe to assume pid_t <= 32 bit in size,
see e.g http://unix.derkeiler.com/Mailing-Lists/AIX-L/2010-08/msg00008.html .
Right now, it is ok to assume pid_t <= 32 bit in size, but this may change in the future.
Also, this patch fixes warning due to lack of an appropriate cast from
http://fate.ffmpeg.org/report.cgi?time=20150820233505&slot=x86-opensolaris-gcc4.3 .
Note that this method of handling pid_t is in line with what nginx does.
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Michael Niedermayer
c719b7a42b
ffserver: add (), fix order of operations
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Reynaldo H. Verdejo Pinochet
b16b8c815c
ffserver: drop superfluous else clause
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
9 years ago
Reynaldo H. Verdejo Pinochet
c75bc268a2
ffserver: simplify assignment with ternary
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
9 years ago
Reynaldo H. Verdejo Pinochet
2ea642ff4b
ffserver: move decl to start of func
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
9 years ago
Reynaldo H. Verdejo Pinochet
08724da976
ffserver: make statement block unconditional by exiting early
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
10 years ago
Reynaldo H. Verdejo Pinochet
36a617c162
ffserver: make statement block unconditional by exiting early
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
10 years ago
Reynaldo H. Verdejo Pinochet
469c335c55
ffserver: unify comment formating & drop unneeded braces
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
10 years ago
Reynaldo H. Verdejo Pinochet
1714fe2990
ffserver: factor out stream params printing
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
10 years ago
Reynaldo H. Verdejo Pinochet
89234deaa2
ffserver: simplify URLContext cleanup
...
Drop unneeded var and avoid checking for NULL twice as
ffurl_closep() already does this.
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
10 years ago
Reynaldo H. Verdejo Pinochet
6504047f82
ffserver: drop unneeded else branching
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
10 years ago
Reynaldo H. Verdejo Pinochet
758c7a5cbc
ffserver: drop unneeded else branching
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
10 years ago
Reynaldo H. Verdejo Pinochet
683f57354d
ffserver: drop unneeded else branching
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
10 years ago
Reynaldo H. Verdejo Pinochet
d8a04d916b
ffserver: formating
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
10 years ago
Caligula useraccount
3b89a67315
ffserver: Use singlejpeg muxer for jpeg
...
Fixes Ticket4218
Based on patch by: Otávio Ribeiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
ddda9cee1c
ffserver: Check for ffio_set_buf_size() failure
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
d6039063aa
ffserver: Check allocations (likely not all)
...
Reviewed-by: "Reynaldo H. Verdejo Pinochet" <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
cea3c9b281
ffserver: check return code of avio_alloc_context()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Reynaldo H. Verdejo Pinochet
e10b2a4dc0
ffserver: remove stale debug stanza
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
10 years ago
Reynaldo H. Verdejo Pinochet
0002a22e0e
ffserver: move assignment outside condition eval
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
10 years ago
Reynaldo H. Verdejo Pinochet
923a244569
ffserver: break some too long lines
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
10 years ago
Reynaldo H. Verdejo Pinochet
df4346c541
ffserver: fix wrong indentation
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
10 years ago
Reynaldo H. Verdejo Pinochet
bd8e16f2e6
ffserver: decouple assignment and check
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
10 years ago
Reynaldo H. Verdejo Pinochet
50c1cac432
ffserver: break too-long lines
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
10 years ago
Reynaldo H. Verdejo Pinochet
8129ccec3a
ffserver: reorder HTTP fwd decls
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
10 years ago
Reynaldo H. Verdejo Pinochet
2699a37816
ffserver: reflow find_stream_in_feed()
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
10 years ago
Reynaldo H. Verdejo Pinochet
197acee767
ffserver: reindent handle_connection()
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
10 years ago
Reynaldo H. Verdejo Pinochet
eadd66a4af
ffserver: reflow handle_connection()
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
10 years ago
Reynaldo H. Verdejo Pinochet
7d3857b7ab
ffserver: reindent http_vlog()
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
10 years ago
Reynaldo H. Verdejo Pinochet
e97545646a
ffserver: reflow http_vlog()
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
10 years ago
Michael Niedermayer
11d8fa5e9d
ffserver: Use av_malloc_array()
...
Reviewed-by: "Reynaldo H. Verdejo Pinochet" <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
eb3e661bab
ffserver: Use avio_closep() to avoid leaving stale pointers in memor
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Reynaldo H. Verdejo Pinochet
9975088472
ffserver: reindent rtsp_cmd_setup()
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
10 years ago
Reynaldo H. Verdejo Pinochet
ac1940b2ba
ffserver: reflow rtsp_cmd_setup()
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
10 years ago
Reynaldo H. Verdejo Pinochet
196bc03a86
ffserver: drop redundant else clause
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
10 years ago