RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
73,103 Commits 36 Branches 392 Tags 305 MiB
Commit Graph

598 Commits

Author SHA1 Message Date
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
Lukasz Marek 3cb0bec687 ffserver: dont leak child arguments 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-11-26 23:32:33 +01:00
Lukasz Marek ec6e035b8b ffserver: export recommented encoder configuration 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-11-26 23:32:33 +01:00
Lukasz Marek aaf6cc925f ffserver: allow skip setting defaults 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-11-26 23:32:33 +01:00
Reynaldo H. Verdejo Pinochet 33d6f90e3e ffserver: drop pointless explicit !=0 checks 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2014-11-16 20:25:55 -03:00
Lukasz Marek f524d2e47c ffserver: move configuration code to separate file 
This commit doesn't change any existing logic.
It moves ffserver configuration related code to separate file.
It intends to make maintaining easier.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-10-22 22:37:40 +02:00
Michael Niedermayer e97f38ce63 ffserver: use av_freep(), do not leave stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-08 15:22:24 +02:00
Reynaldo H. Verdejo Pinochet 2638af2fc5 ffserver: drop custom skip_spaces() impl 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2014-09-13 21:01:01 -03:00
Reynaldo H. Verdejo Pinochet 4c8be331bc ffserver: use correct error for stream not found 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2014-09-13 21:01:01 -03:00
Reimar Döffinger d9e2aceb7f Add missing "const" all over the place. 
Only "./configure --enable-gpl" on x86 was tested.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-08-29 18:57:25 +02:00
Reynaldo H. Verdejo Pinochet fb2de3c4d1 ffserver: warn if config uses a system port 
Should be harmless as far as users know what they are doing
but an informative warning wont hurt. For details, refer to
http://tools.ietf.org/html/rfc6335

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2014-08-17 22:51:45 -04:00
Stefano Sabatini 1013d8dd69 ffserver: deprecate Port and BindAddress options in favor of HTTPPort and HTTPBindAddress 
The new option names are more explicit.

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2014-08-17 22:51:45 -04:00
Michael Niedermayer 81a663f49e Drop remaining unneeded != NULL 
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-15 22:47:45 +02:00
Michael Niedermayer fb33bff990 Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39' 
* commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39':
  cosmetics: Write NULL pointer equality checks more compactly

Conflicts:
	cmdutils.c
	ffmpeg_opt.c
	ffplay.c
	libavcodec/dvbsub.c
	libavcodec/dvdsubdec.c
	libavcodec/dvdsubenc.c
	libavcodec/dxa.c
	libavcodec/libxvid_rc.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/rv10.c
	libavcodec/tiffenc.c
	libavcodec/utils.c
	libavcodec/vc1dec.c
	libavcodec/zmbv.c
	libavdevice/v4l2.c
	libavformat/matroskadec.c
	libavformat/movenc.c
	libavformat/sdp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-15 21:00:50 +02:00
Michael Niedermayer 1d8d21b90a ffserver: initialize pbuffer in prepare_sdp_description() 
also check pbuffer before use

Found-by: CSA
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-02 18:32:37 +02:00
Michael Niedermayer f46e876027 ffserver: use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-17 18:00:25 +02:00
Michael Niedermayer 307239bdb6 ffserver: add HAVE_UNISTD_H around #include <unistd.h> 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 01:56:53 +02:00
Reynaldo H. Verdejo Pinochet e0877aa544 ffserver: don't leak poll_table if poll fails 
Should fix Coverity Scan issue #732265

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
 2014-05-10 18:16:19 -04:00