Merge commit 'bf5f46b4cc47b7a4568119f224057d4ff91b6cdd'

* commit 'bf5f46b4cc47b7a4568119f224057d4ff91b6cdd': APIChanges: add entry for av_read_packet deprecation mxfdec: fix typo in mxf_read_seek() avserver: use freopen to redirect stdin/out/err to /dev/null avserver: remove daemon mode configure: Check for -Werror parameters on clang doxygen: remove obsolete options from Doxyfile configure: Add option to disable all command line programs Conflicts: Changelog configure doc/APIchanges doc/ffserver.conf doc/ffserver.texi ffserver.c

Michael Niedermayer committed 14 years ago

Commit 3db32ec2 parents 9264810 bf5f46b7 files · +25 −80Browse files

Unified · Split

7 files

Changelog +1 −0
configure +12 −4
doc/APIchanges +4 −0
doc/Doxyfile +0 −17
doc/ffserver.conf +0 −4
doc/ffserver.texi +1 −7
ffserver.c +7 −48

Changelog+1−0

@@ -23,6 +23,7 @@ version <next>: · 22 unmodified lines
23	- field filter ported from libmpcodecs	23	- field filter ported from libmpcodecs
24	- AVR demuxer	24	- AVR demuxer
25	- geq filter ported from libmpcodecs	25	- geq filter ported from libmpcodecs
		26	- remove ffserver daemon mode
26		27
27		28
28	version 1.0:	29	version 1.0:

configure+12−4

   --enable-gray            enable full grayscale support (slower color)
   --disable-swscale-alpha  disable alpha channel support in swscale
+Program options:
+  --disable-programs       do not build command line programs
+  --disable-ffmpeg         disable ffmpeg build
+  --disable-ffplay         disable ffplay build
+  --disable-ffprobe        disable ffprobe build
+  --disable-ffserver       disable ffserver build
 Documentation options:
   --disable-doc            do not build documentation
   --disable-htmlpages      do not build HTML documentation pages
   --disable-txtpages       do not build text documentation pages
 Component options:
-  --disable-ffmpeg         disable ffmpeg build
-  --disable-ffplay         disable ffplay build
-  --disable-ffprobe        disable ffprobe build
-  --disable-ffserver       disable ffserver build
   --disable-avdevice       disable libavdevice build
   --disable-avcodec        disable libavcodec build
   --disable-avformat       disable libavformat build
     ;;
     --enable-debug=*) debuglevel="$optval"
     ;;
+    --disable-programs)
+    disable $PROGRAM_LIST
+    ;;
     --disable-everything)
     map 'eval unset \${$(toupper ${v%s})_LIST}' $COMPONENT_LIST
     ;;
 elif enabled clang; then
     check_cflags -mllvm -stack-alignment=16
     check_cflags -Qunused-arguments
+    check_cflags -Werror=implicit-function-declaration
+    check_cflags -Werror=missing-prototypes
 elif enabled armcc; then
     # 2523: use of inline assembler is deprecated
     add_cflags -W${armcc_opt},--diag_suppress=2523

doc/APIchanges+4−0

 2012-01-24 - 0c3577b - lavfi 2.60.100
   Add avfilter_graph_dump.
+2012-03-20 - 3c90cc2 - lavfo 54.2.0
+  Deprecate av_read_packet(), use av_read_frame() with
+  AVFMT_FLAG_NOPARSE | AVFMT_FLAG_NOFILLIN in AVFormatContext.flags
 2012-03-05 - lavc 54.8.0
   6699d07 Add av_get_exact_bits_per_sample()
   9524cf7 Add av_get_audio_frame_duration()

doc/Doxyfile+0−17

 SHOW_USED_FILES        = YES
-# If the sources in your project are distributed over multiple directories
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
-# in the documentation. The default is NO.
-SHOW_DIRECTORIES       = NO
 # Set the SHOW_FILES tag to NO to disable the generation of the Files page.
 # This will remove the Files entry from the Quick Index and from the
 # Folder Tree View (if specified). The default is YES.
 HTML_TIMESTAMP         = YES
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
-# files or namespaces will be aligned in HTML using tables. If set to
-# NO a bullet list will be used.
-HTML_ALIGN_MEMBERS     = YES
 # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
 # documentation will contain sections that can be hidden and shown after the
 # page has loaded. For this to work a browser that supports
 GENERATE_TREEVIEW      = NO
-# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
-# and Class Hierarchy pages using a tree view instead of an ordered list.
-USE_INLINE_TREES       = NO
 # If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
 # used to set the initial width (in pixels) of the frame in which the tree
 # is shown.

doc/ffserver.conf+0−4

@@ -25,10 +25,6 @@ MaxBandwidth 1000 · 24 unmodified lines
25	# '-' is the standard output.	25	# '-' is the standard output.
26	CustomLog -	26	CustomLog -
27		27
28	# Suppress that if you want to launch ffserver as a daemon.
29	NoDaemon
30
31
32	##################################################################	28	##################################################################
33	# Definition of the live feeds. Each live feed contains one video	29	# Definition of the live feeds. Each live feed contains one video
34	# and/or audio sequence coming from an ffmpeg encoder or another	30	# and/or audio sequence coming from an ffmpeg encoder or another

doc/ffserver.texi+1−7

@@ -28,11 +28,6 @@ several live feeds, streaming from files and time shifting on live feeds · 27 unmodified lines
28	(you can seek to positions in the past on each live feed, provided you	28	(you can seek to positions in the past on each live feed, provided you
29	specify a big enough feed storage in ffserver.conf).	29	specify a big enough feed storage in ffserver.conf).
30		30
31	ffserver runs in daemon mode by default; that is, it puts itself in
32	the background and detaches from its TTY, unless it is launched in
33	debug mode or a NoDaemon option is specified in the configuration
34	file.
35
36	This documentation covers only the streaming aspects of ffserver /	31	This documentation covers only the streaming aspects of ffserver /
37	ffmpeg. All questions about parameters for ffmpeg, codec questions,	32	ffmpeg. All questions about parameters for ffmpeg, codec questions,
38	etc. are not covered here. Read @file{ffmpeg.html} for more	33	etc. are not covered here. Read @file{ffmpeg.html} for more
@@ -267,8 +262,7 @@ within the various <Stream> sections. Since ffserver will not launch · 228 unmodified lines
267	any ffmpeg instances, you will have to launch them manually.	262	any ffmpeg instances, you will have to launch them manually.
268	@item -d	263	@item -d
269	Enable debug mode. This option increases log verbosity, directs log	264	Enable debug mode. This option increases log verbosity, directs log
270	messages to stdout and causes ffserver to run in the foreground	265	messages to stdout.
271	rather than as a daemon.
272	@end table	266	@end table
273	@c man end	267	@c man end
274		268

ffserver.c+7−48

 #endif
 #include <string.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include "libavformat/avformat.h"
 // FIXME those are internal headers, ffserver _really_ shouldn't use them
 #include "libavformat/ffm.h"
                              HTTPContext *rtsp_c);
 static const char *my_program_name;
-static const char *my_program_dir;
 static const char *config_filename = "/etc/ffserver.conf";
 static int ffserver_debug;
-static int ffserver_daemon;
 static int no_launch;
 static int need_to_start_children;
                     close(i);
                 if (!ffserver_debug) {
-                    i = open("/dev/null", O_RDWR);
+                    if (!freopen("/dev/null", "r", stdin))
-                    if (i != -1) {
+                        http_log("failed to redirect STDIN to /dev/null\n;");
-                        dup2(i, 0);
+                    if (!freopen("/dev/null", "w", stdout))
-                        dup2(i, 1);
+                        http_log("failed to redirect STDOUT to /dev/null\n;");
-                        dup2(i, 2);
+                    if (!freopen("/dev/null", "w", stderr))
-                        close(i);
+                        http_log("failed to redirect STDERR to /dev/null\n;");
-                    }
-                }
-                /* This is needed to make relative pathnames work */
-                if (chdir(my_program_dir) < 0) {
-                    http_log("chdir failed\n");
-                    exit(1);
                 }
                 signal(SIGPIPE, SIG_DFL);
             if (resolve_host(&my_http_addr.sin_addr, arg) != 0) {
                 ERROR("%s:%d: Invalid host/IP address: %s\n", arg);
             }
-        } else if (!av_strcasecmp(cmd, "NoDaemon")) {
-            ffserver_daemon = 0;
         } else if (!av_strcasecmp(cmd, "RTSPPort")) {
             get_arg(arg, sizeof(arg), &p);
             val = atoi(arg);
 static void opt_debug(void)
 {
     ffserver_debug = 1;
-    ffserver_daemon = 0;
     logfilename[0] = '-';
 }
     show_banner(argc, argv, options);
     my_program_name = argv[0];
-    my_program_dir = getcwd(0, 0);
-    ffserver_daemon = 1;
     parse_options(NULL, argc, argv, options, NULL);
     compute_bandwidth();
-    /* put the process in background and detach it from its TTY */
-    if (ffserver_daemon) {
-        int pid;
-        pid = fork();
-        if (pid < 0) {
-            perror("fork");
-            exit(1);
-        } else if (pid > 0) {
-            /* parent : exit */
-            exit(0);
-        } else {
-            /* child */
-            setsid();
-            close(0);
-            open("/dev/null", O_RDWR);
-            if (strcmp(logfilename, "-") != 0) {
-                close(1);
-                dup(0);
-            }
-            close(2);
-            dup(0);
-        }
-    }
     /* signal init */
     signal(SIGPIPE, SIG_IGN);
-    if (ffserver_daemon)
-        chdir("/");
     if (http_server() < 0) {
         http_log("Could not start server\n");
         exit(1);

Merge commit 'bf5f46b4cc47b7a4568119f224057d4ff91b6cdd'

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code