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 >
2015-11-09 19:30:26 -05:00
c2f861ca42
Replace remaining occurances of av_free_packet with av_packet_unref
2015-10-27 14:35:30 +01:00
fe95b0eb8f
ffserver: avoid leaking pathname at exit
...
Fixes Coverity CID 1325681
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com >
2015-10-04 22:31:22 -07:00
84b4998dbd
ffserver: fix up rate units in server messages
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com >
2015-10-04 15:58:35 -07:00
d8c714cb24
ffserver: wrap around bandwidth exceeded msg text
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com >
2015-10-04 15:58:35 -07:00
8a9089948f
ffserver: wrap around too-busy message text
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com >
2015-10-04 15:58:35 -07:00
3388bcced4
ffserver: unify exit path in _write_index()
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com >
2015-10-04 15:58:35 -07:00
c677b42f79
ffserver: explicitly free() duped filename
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com >
2015-09-18 16:24:38 -07:00
fb349359dc
ffserver: start dropping all unneededly harcoded str lengths
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com >
2015-09-18 16:24:33 -07:00
7404f3bdb9
lavc: Switch bitrate to 64bit unless compatibility with avconv was requested.
2015-09-15 18:02:43 +02:00
314bc20d7a
ffserver: remove redundant comment, clarify another one
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com >
2015-09-11 18:33:29 -07:00
2580395e1c
ffserver: unify exit path in http_server()
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com >
2015-09-11 18:33:13 -07:00
9a168e9371
ffserver: unify fail path in socket_open_listen()
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com >
2015-09-11 18:08:08 -07:00
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 >
2015-08-21 15:47:54 +02:00
29d147c94d
Merge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba'
...
* commit '059a934806d61f7af9ab3fd9f74994b838ea5eba':
lavc: Consistently prefix input buffer defines
Conflicts:
doc/examples/decoding_encoding.c
libavcodec/4xm.c
libavcodec/aac_adtstoasc_bsf.c
libavcodec/aacdec.c
libavcodec/aacenc.c
libavcodec/ac3dec.h
libavcodec/asvenc.c
libavcodec/avcodec.h
libavcodec/avpacket.c
libavcodec/dvdec.c
libavcodec/ffv1enc.c
libavcodec/g2meet.c
libavcodec/gif.c
libavcodec/h264.c
libavcodec/h264_mp4toannexb_bsf.c
libavcodec/huffyuvdec.c
libavcodec/huffyuvenc.c
libavcodec/jpeglsenc.c
libavcodec/libxvid.c
libavcodec/mdec.c
libavcodec/motionpixels.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/noise_bsf.c
libavcodec/nuv.c
libavcodec/nvenc.c
libavcodec/options.c
libavcodec/parser.c
libavcodec/pngenc.c
libavcodec/proresenc_kostya.c
libavcodec/qsvdec.c
libavcodec/svq1enc.c
libavcodec/tiffenc.c
libavcodec/truemotion2.c
libavcodec/utils.c
libavcodec/utvideoenc.c
libavcodec/vc1dec.c
libavcodec/wmalosslessdec.c
libavformat/adxdec.c
libavformat/aiffdec.c
libavformat/apc.c
libavformat/apetag.c
libavformat/avidec.c
libavformat/bink.c
libavformat/cafdec.c
libavformat/flvdec.c
libavformat/id3v2.c
libavformat/isom.c
libavformat/matroskadec.c
libavformat/mov.c
libavformat/mpc.c
libavformat/mpc8.c
libavformat/mpegts.c
libavformat/mvi.c
libavformat/mxfdec.c
libavformat/mxg.c
libavformat/nutdec.c
libavformat/oggdec.c
libavformat/oggparsecelt.c
libavformat/oggparseflac.c
libavformat/oggparseopus.c
libavformat/oggparsespeex.c
libavformat/omadec.c
libavformat/rawdec.c
libavformat/riffdec.c
libavformat/rl2.c
libavformat/rmdec.c
libavformat/rtpdec_latm.c
libavformat/rtpdec_mpeg4.c
libavformat/rtpdec_qdm2.c
libavformat/rtpdec_svq3.c
libavformat/sierravmd.c
libavformat/smacker.c
libavformat/smush.c
libavformat/spdifenc.c
libavformat/takdec.c
libavformat/tta.c
libavformat/utils.c
libavformat/vqf.c
libavformat/westwood_vqa.c
libavformat/xmv.c
libavformat/xwma.c
libavformat/yop.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc >
2015-07-27 23:15:19 +02:00
c719b7a42b
ffserver: add (), fix order of operations
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2015-07-27 11:40:00 +02:00
b16b8c815c
ffserver: drop superfluous else clause
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com >
2015-07-26 23:53:08 -03:00
c75bc268a2
ffserver: simplify assignment with ternary
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com >
2015-07-26 23:11:37 -03:00
2ea642ff4b
ffserver: move decl to start of func
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com >
2015-07-26 22:29:47 -03:00
08724da976
ffserver: make statement block unconditional by exiting early
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com >
2015-06-24 19:17:51 -03:00
36a617c162
ffserver: make statement block unconditional by exiting early
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com >
2015-06-24 19:17:51 -03:00
469c335c55
ffserver: unify comment formating & drop unneeded braces
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com >
2015-06-24 19:17:51 -03:00
1714fe2990
ffserver: factor out stream params printing
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com >
2015-06-24 19:17:51 -03:00
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 >
2015-06-24 19:17:51 -03:00
6504047f82
ffserver: drop unneeded else branching
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com >
2015-06-21 19:06:00 -03:00
758c7a5cbc
ffserver: drop unneeded else branching
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com >
2015-06-21 19:06:00 -03:00
683f57354d
ffserver: drop unneeded else branching
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com >
2015-06-21 19:06:00 -03:00
d8a04d916b
ffserver: formating
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com >
2015-06-21 19:06:00 -03:00
3b89a67315
ffserver: Use singlejpeg muxer for jpeg
...
Fixes Ticket4218
Based on patch by: Otávio Ribeiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-08 03:36:22 +02:00
ddda9cee1c
ffserver: Check for ffio_set_buf_size() failure
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-07 15:10:24 +02:00
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 >
2015-06-07 12:42:48 +02:00
cea3c9b281
ffserver: check return code of avio_alloc_context()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-02 14:45:08 +02:00
e10b2a4dc0
ffserver: remove stale debug stanza
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com >
2015-03-08 18:24:56 -03:00
0002a22e0e
ffserver: move assignment outside condition eval
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com >
2015-03-08 18:24:56 -03:00
923a244569
ffserver: break some too long lines
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com >
2015-03-08 18:24:56 -03:00
df4346c541
ffserver: fix wrong indentation
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com >
2015-02-15 15:15:41 -03:00
bd8e16f2e6
ffserver: decouple assignment and check
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com >
2015-02-15 15:15:41 -03:00
50c1cac432
ffserver: break too-long lines
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com >
2015-02-15 15:15:41 -03:00
8129ccec3a
ffserver: reorder HTTP fwd decls
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com >
2015-02-15 15:15:40 -03:00
2699a37816
ffserver: reflow find_stream_in_feed()
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com >
2015-01-24 02:22:09 -03:00
197acee767
ffserver: reindent handle_connection()
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com >
2015-01-24 02:22:04 -03:00
eadd66a4af
ffserver: reflow handle_connection()
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com >
2015-01-24 02:19:08 -03:00
7d3857b7ab
ffserver: reindent http_vlog()
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com >
2015-01-24 01:11:58 -03:00
e97545646a
ffserver: reflow http_vlog()
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com >
2015-01-24 01:10:35 -03:00
11d8fa5e9d
ffserver: Use av_malloc_array()
...
Reviewed-by: "Reynaldo H. Verdejo Pinochet" <reynaldo@osg.samsung.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-01-10 00:17:38 +01:00
eb3e661bab
ffserver: Use avio_closep() to avoid leaving stale pointers in memor
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-01-08 14:11:12 +01:00
9975088472
ffserver: reindent rtsp_cmd_setup()
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com >
2015-01-03 20:22:45 -03:00
ac1940b2ba
ffserver: reflow rtsp_cmd_setup()
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com >
2015-01-03 20:22:45 -03:00
196bc03a86
ffserver: drop redundant else clause
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com >
2015-01-03 20:22:45 -03:00
9e55130a9d
ffserver: reindent compute_status()
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com >
2015-01-03 20:22:45 -03:00
