virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity
76,649 Commits 37 Branches 400 Tags 467 MiB
2437e69aec
Commit Graph

615 Commits

Author SHA1 Message Date
Michael Niedermayer
e0cb113f9b ffserver: Check chunk size 
Fixes out of array access

Fixes: poc_ffserver.py
Found-by: Paul Cher <paulcher@icloud.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit a5d25faa3f)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-12-06 00:59:22 +01:00
Hendrik Leppkes
65fff8e71a cmdutils: remove the current working directory from the DLL search path on win32 
Reviewed-by: Matt Oliver <protogonoi@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 3bf142c773)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-08-15 20:25:13 +02:00
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>
 2015-08-21 15:47:54 +02:00
Michael Niedermayer
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
Michael Niedermayer
c719b7a42b ffserver: add (), fix order of operations 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-27 11:40:00 +02:00
Reynaldo H. Verdejo Pinochet
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
Reynaldo H. Verdejo Pinochet
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
Reynaldo H. Verdejo Pinochet
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
Reynaldo H. Verdejo Pinochet
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
Reynaldo H. Verdejo Pinochet
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
Reynaldo H. Verdejo Pinochet
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
Reynaldo H. Verdejo Pinochet
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
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>
 2015-06-24 19:17:51 -03:00
Reynaldo H. Verdejo Pinochet
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
Reynaldo H. Verdejo Pinochet
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
Reynaldo H. Verdejo Pinochet
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
Reynaldo H. Verdejo Pinochet
d8a04d916b ffserver: formating 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2015-06-21 19:06:00 -03:00
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>
 2015-06-08 03:36:22 +02:00
Michael Niedermayer
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
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>
 2015-06-07 12:42:48 +02:00
Michael Niedermayer
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
Reynaldo H. Verdejo Pinochet
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
Reynaldo H. Verdejo Pinochet
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
Reynaldo H. Verdejo Pinochet
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
Reynaldo H. Verdejo Pinochet
df4346c541 ffserver: fix wrong indentation 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2015-02-15 15:15:41 -03:00
Reynaldo H. Verdejo Pinochet
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
Reynaldo H. Verdejo Pinochet
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
Reynaldo H. Verdejo Pinochet
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
Reynaldo H. Verdejo Pinochet
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
Reynaldo H. Verdejo Pinochet
197acee767 ffserver: reindent handle_connection() 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2015-01-24 02:22:04 -03:00
Reynaldo H. Verdejo Pinochet
eadd66a4af ffserver: reflow handle_connection() 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2015-01-24 02:19:08 -03:00
Reynaldo H. Verdejo Pinochet
7d3857b7ab ffserver: reindent http_vlog() 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2015-01-24 01:11:58 -03:00
Reynaldo H. Verdejo Pinochet
e97545646a ffserver: reflow http_vlog() 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2015-01-24 01:10:35 -03:00
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>
 2015-01-10 00:17:38 +01:00
Michael Niedermayer
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
Reynaldo H. Verdejo Pinochet
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
Reynaldo H. Verdejo Pinochet
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
Reynaldo H. Verdejo Pinochet
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
Reynaldo H. Verdejo Pinochet
9e55130a9d ffserver: reindent compute_status() 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2015-01-03 20:22:45 -03:00
Reynaldo H. Verdejo Pinochet
907101eb83 ffserver: reflow compute_status() 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2015-01-03 20:22:45 -03:00
Reynaldo H. Verdejo Pinochet
a18456a203 ffserver: check for EOF|error at loop condition 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2014-12-26 19:02:16 -03:00
Reynaldo H. Verdejo Pinochet
0121ddabb8 ffserver: reflow close_connection() 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2014-12-26 18:44:33 -03:00
Reynaldo H. Verdejo Pinochet
1146223699 ffserver: minor formatting improvement to http_server() 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2014-12-26 18:34:52 -03:00
Reynaldo H. Verdejo Pinochet
978bc4327b ffserver: reindent start_multicast() 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2014-12-26 18:18:19 -03:00
Reynaldo H. Verdejo Pinochet
719cc02586 ffserver: reflow start_multicast() 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2014-12-26 18:12:39 -03:00
Reynaldo H. Verdejo Pinochet
18011888cc ffserver: reindent start_children() 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2014-12-26 17:45:56 -03:00
Reynaldo H. Verdejo Pinochet
ec42251715 ffserver: reflow start_children() 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2014-12-26 17:45:56 -03:00
Reynaldo H. Verdejo Pinochet
1abdfb100a ffserver: break lines at 80 in func prototypes 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2014-12-26 17:45:56 -03:00
Lukasz Marek
8b0226f2a6 ffserver: use avcodec_copy_context to copy context 
Copying context using dedicated function is safer that raw memcpy
which creates shallow copy.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-12-02 21:58:34 +01:00
Lukasz Marek
3d0867917f ffserver: dont leak pb_buffer 2014-11-26 23:32:33 +01:00