audioconvert: add explanatory comments to channel_names array

[ffmpeg] / avserver.c

diff --git a/avserver.c b/avserver.c
index f31b8ddb013616e8167cbf608cff0eab4a6bacae..df9d07d1ad95f58b76ddfb9dc5bf9230420097a8 100644 (file)
--- a/avserver.c
+++ b/avserver.c
@@ -320,6 +320,11 @@ static AVLFG random_state;
 
 static FILE *logfile = NULL;
 
+void exit_program(int ret)
+{
+    exit(ret);
+}
+
 /* FIXME: make avserver work with IPv6 */
 /* resolve host with also IP address parsing */
 static int resolve_host(struct in_addr *sin_addr, const char *hostname)
@@ -2162,7 +2167,7 @@ static int open_input_stream(HTTPContext *c, const char *info)
     }
     s->flags |= AVFMT_FLAG_GENPTS;
     c->fmt_in = s;
-    if (strcmp(s->iformat->name, "ffm") && av_find_stream_info(c->fmt_in) < 0) {
+    if (strcmp(s->iformat->name, "ffm") && avformat_find_stream_info(c->fmt_in, NULL) < 0) {
         http_log("Could not find stream info '%s'\n", input_filename);
         av_close_input_file(s);
         return -1;
@@ -3621,7 +3626,7 @@ static void build_file_streams(void)
             } else {
                 /* find all the AVStreams inside and reference them in
                    'stream' */
-                if (av_find_stream_info(infile) < 0) {
+                if (avformat_find_stream_info(infile, NULL) < 0) {
                     http_log("Could not find codec parameters from '%s'\n",
                              stream->feed_filename);
                     av_close_input_file(infile);
@@ -4671,7 +4676,7 @@ int main(int argc, char **argv)
     my_program_dir = getcwd(0, 0);
     avserver_daemon = 1;
 
-    parse_options(argc, argv, options, NULL);
+    parse_options(NULL, argc, argv, options, NULL);
 
     unsetenv("http_proxy");             /* Kill the http_proxy */