generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
23,882 Commits 24 Branches 241 Tags 173 MiB
ad6408960b
Commit Graph

354 Commits

Author SHA1 Message Date
Aurelien Jacobs
2bb6eba21d remove ff_get_fourcc() and use AV_RL32() instead 
Originally committed as revision 16654 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-17 12:21:01 +00:00
Aurelien Jacobs
b250f9c66d Change semantic of CONFIG_*, HAVE_* and ARCH_*. 
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-13 23:44:16 +00:00
Stefano Sabatini
959da985b0 Include libavformat/avformat.h before all the other libav* headers. 
This is safer since they may use the symbol LIBAVFORMAT_BUILD defined
in avformat.h.

Originally committed as revision 16589 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-13 23:36:06 +00:00
Aurelien Jacobs
1d6eeebe08 initialize AVFormatContext before calling av_write_header() 
Originally committed as revision 16505 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-09 20:03:53 +00:00
Carl Eugen Hoyos
aed464654b Silence two icc warnings: 
/home/melanson/fate/source/ffserver.c(4349):
warning #188: enumerated type mixed with another type
                          audio_enc.codec_id = audio_id;
                                             ^

/home/melanson/fate/source/ffserver.c(4354):
warning #188: enumerated type mixed with another type
                          video_enc.codec_id = video_id;
                                             ^

Originally committed as revision 16397 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-30 12:02:35 +00:00
Stefano Sabatini
5c548937e0 Cosmetics, change variable name "o2" to "o" in ffserver_opt_default(). 
Originally committed as revision 16242 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-19 22:33:15 +00:00
Stefano Sabatini
f16dd7e65a Remove calls to deprecated av_set_string2() with calls to 
av_set_string3().

Originally committed as revision 16241 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-19 22:29:30 +00:00
Stefano Sabatini
10ba7404d2 s/FFserver/ffserver/ in the help message invocation synopsis. 
See the thread: "Define cmdline_program_name and use it in show_help".

Originally committed as revision 15952 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-29 12:22:22 +00:00
Baptiste Coudurier
a3341b9da6 cosmetics: ffserver -> FFserver 
Originally committed as revision 15695 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-25 00:51:45 +00:00
Baptiste Coudurier
f973914406 cosmetics, indentation 
Originally committed as revision 15694 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-25 00:50:23 +00:00
Baptiste Coudurier
a69b06be93 check if stream is set, fix potential segv 
Originally committed as revision 15693 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-25 00:49:56 +00:00
Aurelien Jacobs
37d3e0667a uses FF_ARRAY_ELEMS() where appropriate 
Originally committed as revision 15662 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-21 21:40:24 +00:00
Baptiste Coudurier
0be4b8d930 cosmetics, remove useless spaces 
Originally committed as revision 15506 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-01 20:45:06 +00:00
Ronald S. Bultje
90abbdba1e Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us 
that it only describes the lower-level transport (TCP vs. UDP) and not the
actual data layout (e.g. RDT vs. RTP). See discussion in "Realmedia patch"
thread on ML.

Originally committed as revision 15481 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-30 13:18:41 +00:00
Diego Pettenò
dc771f6b5f Remove some format string warnings. 
patch by Diego Pettenò, flameeyes gmail com

Originally committed as revision 15461 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-29 07:15:49 +00:00
Michael Niedermayer
df1a4b1134 Rename opt_default() so it will not conflict with the one from ffmpeg.c 
when it is moved to cmdutils.c/h.

Originally committed as revision 15449 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-28 19:33:19 +00:00
Baptiste Coudurier
637b638e1e only write trailer when state says so, should fix issue #646 
Originally committed as revision 15398 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-24 17:11:46 +00:00
Baptiste Coudurier
31296f6eec add missing html start tag to ffserver status html page 
Originally committed as revision 15241 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-07 05:05:10 +00:00
Baptiste Coudurier
a3aa4fed62 cleanup, merge snprintf calls 
Originally committed as revision 15240 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-07 04:56:44 +00:00
Baptiste Coudurier
a7f361eb13 100l, compute correctly poll_table size when allocating 
Originally committed as revision 15238 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-07 04:16:05 +00:00
Stefano Sabatini
4af92de6f6 Make the nb_max_connections and nb_connections int variables unsigned. 
Originally committed as revision 15191 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-03 20:10:32 +00:00
Stefano Sabatini
1c9ff17920 Make the maximum number of simultaneous HTTP connections handled by 
ffserver a configuration parameter. The name of the new parameter
introduced is MaxHTTPConnections.

Originally committed as revision 15182 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-03 18:16:34 +00:00
Aurelien Jacobs
ea452b54f0 strcasecmp() requires #include <strings.h> 
Originally committed as revision 14728 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-13 17:22:53 +00:00
Aurelien Jacobs
29d3ed3be6 ffserver: SA_RESTART and unsetenv require _XOPEN_SOURCE 
Originally committed as revision 14724 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-13 10:03:20 +00:00
Diego Biurrun
e16190fa7a cosmetics: typo fixes 
Originally committed as revision 14376 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-24 21:12:37 +00:00
Baptiste Coudurier
59e7894c3d print AVCodecContext address instead of AVClass, better when multiple instances of same codecs are used, based on r14237 
Originally committed as revision 14255 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-16 03:21:23 +00:00
Stefano Sabatini
7ac884c591 Fix a warning in ffserver.c caused by the use of the function 
av_set_string() deprecated since r14134.

Originally committed as revision 14145 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-09 21:51:40 +00:00
Baptiste Coudurier
a9d9aa3613 revert r13867, - reference stdout, I was drunk 
Originally committed as revision 13978 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-25 19:55:00 +00:00
Baptiste Coudurier
80b616fca3 use http_log now that logfile is setup 
Originally committed as revision 13975 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-25 19:00:06 +00:00
Baptiste Coudurier
f10d55ed88 move logfile setup right after config parsing 
Originally committed as revision 13974 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-25 18:51:54 +00:00
Baptiste Coudurier
f0754ad822 remove useless init 
Originally committed as revision 13973 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-25 18:51:21 +00:00
Stefano Sabatini
8bf61f5ba9 Reindent. 
Originally committed as revision 13956 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-24 22:30:41 +00:00
Stefano Sabatini
5dc8eeb639 Make ffserver show launched commandlines not only in debug-mode. 
Originally committed as revision 13955 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-24 22:27:37 +00:00
Stefano Sabatini
6aada9b1ba Use http_log() rather than printing on stdout to show the launched 
commandlines.

Originally committed as revision 13954 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-24 21:35:27 +00:00
Stefano Sabatini
40444a59c1 Make ffserver show each launched commandline just before to launch 
them rather than print them when parsing the configuration file. This
way those commandlines are not showed anymore in no-launch mode.

Originally committed as revision 13950 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-24 21:26:20 +00:00
Baptiste Coudurier
14c43f918f log when feed is already being received 
Originally committed as revision 13939 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-24 02:02:32 +00:00
Baptiste Coudurier
65f2f028ff reindent 
Originally committed as revision 13938 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-24 02:00:54 +00:00
Baptiste Coudurier
cb51aef1ab copy extradata if present 
Originally committed as revision 13913 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-23 19:57:58 +00:00
Stefano Sabatini
496a613293 Make ffserver daemon chdir()s just after log init. This way a 
relative path for the logfile is resolved according to the directory
where ffserver has been launched, as the user expects.

Originally committed as revision 13911 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-23 19:43:38 +00:00
Baptiste Coudurier
b06759549f fix segv, fmt_ctx is not set for rtsp 
Originally committed as revision 13910 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-23 17:57:31 +00:00
Baptiste Coudurier
ace21da3cf cosmetics, braces placement 
Originally committed as revision 13908 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-23 08:12:15 +00:00
Baptiste Coudurier
3ab29d8e4f 10l, do not use ctx before being set, fix segv 
Originally committed as revision 13906 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-23 07:28:49 +00:00
Baptiste Coudurier
dc3a6a368c fix compilation, this should be better 
Originally committed as revision 13905 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-23 03:21:40 +00:00
Baptiste Coudurier
4def51fa59 10l, move init after possible goto 
Originally committed as revision 13904 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-23 03:18:55 +00:00
Baptiste Coudurier
8f56ccca92 simplify, use ist 
Originally committed as revision 13903 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-23 03:18:24 +00:00
Baptiste Coudurier
250be719e4 fix source stream, source_index is refering to fmt_in, needs testing 
Originally committed as revision 13902 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-23 03:16:24 +00:00
Baptiste Coudurier
d80904cc87 simplify 
Originally committed as revision 13901 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-23 02:41:06 +00:00
Baptiste Coudurier
e21ac20921 no need to print date anymore since done in http_log 
Originally committed as revision 13900 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-23 02:16:00 +00:00
Baptiste Coudurier
3d9cc27df8 move code setting output parameters after possible failure 
Originally committed as revision 13876 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-22 03:42:23 +00:00
Baptiste Coudurier
697efa36c7 move code after possible failure, so no need to free 
Originally committed as revision 13875 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-22 03:30:53 +00:00
Baptiste Coudurier
e6f0deab80 check av_open_input_stream error 
Originally committed as revision 13874 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-22 03:25:20 +00:00
Baptiste Coudurier
fbc6314428 remove return 1, we don't change state, we are still sending data 
Originally committed as revision 13873 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-22 03:20:28 +00:00
Baptiste Coudurier
86771c6804 free pb 
Originally committed as revision 13872 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-22 02:34:33 +00:00
Baptiste Coudurier
f2972c8c82 use av_open_input_stream 
Originally committed as revision 13871 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-22 02:31:57 +00:00
Baptiste Coudurier
381ec67749 do not allocate st->codec, it will be overwritten later; fix memleak 
Originally committed as revision 13870 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-22 02:15:13 +00:00
Baptiste Coudurier
0b459fb2d8 log to stderr 
Originally committed as revision 13867 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-22 01:31:37 +00:00
Baptiste Coudurier
bcd3ce5903 add callback for av_log 
Originally committed as revision 13866 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-22 01:30:41 +00:00
Baptiste Coudurier
82e0be62ef no need to print date anymore since done in http_log 
Originally committed as revision 13865 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-22 01:13:33 +00:00
Baptiste Coudurier
9fd3442f63 use ctime1 
Originally committed as revision 13864 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-22 01:12:39 +00:00
Baptiste Coudurier
124ed1c073 print date in http_log 
Originally committed as revision 13863 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-22 01:08:48 +00:00
Baptiste Coudurier
fa288df453 remove useless init 
Originally committed as revision 13862 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-22 00:55:23 +00:00
Baptiste Coudurier
f69bb0cc1c merge declaration and init 
Originally committed as revision 13861 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-22 00:54:25 +00:00
Baptiste Coudurier
2b9cd1e78a reindent 
Originally committed as revision 13860 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-22 00:53:28 +00:00
Baptiste Coudurier
d2a1ea1d9b http or rtsp only support 
Originally committed as revision 13859 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-22 00:52:22 +00:00
Baptiste Coudurier
3296409d5c fix open return check 
Originally committed as revision 13858 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-22 00:33:08 +00:00
Erik Hovland
0679719d5b fix feed_filename test, field is char [1024], patch by Erik Hovland, erik at hovland dot org 
Originally committed as revision 13857 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-22 00:30:48 +00:00
Baptiste Coudurier
60a04f7fc9 use av_seek_frame to flush demxu pending packets, fixes seeking, should have been done when av_find_stream_info was added 
Originally committed as revision 13855 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-22 00:22:21 +00:00
Baptiste Coudurier
f8b06be970 free c->pb_buffer before overwriting it, fix memleak 
Originally committed as revision 13853 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-21 06:08:59 +00:00
Baptiste Coudurier
4f0a942bae return 1 when error during write frame, state changed 
Originally committed as revision 13851 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-21 03:55:25 +00:00
Baptiste Coudurier
8aae202e44 set default preload and max_delay for muxer to avoid mpeg ps muxer to spit many underflow errors, use ffmpeg default values 
Originally committed as revision 13850 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-21 03:43:16 +00:00
Baptiste Coudurier
177d256402 change bandwidth to unsigned 
Originally committed as revision 13849 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-21 03:38:49 +00:00
Baptiste Coudurier
794ac28c52 remove useless init, logfilename is static 
Originally committed as revision 13848 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-21 03:37:04 +00:00
Baptiste Coudurier
acae1492cf use http_log when log file is setup 
Originally committed as revision 13847 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-21 03:35:48 +00:00
Baptiste Coudurier
4e8f77ab61 always use stdout to log when running in debug mode 
Originally committed as revision 13846 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-21 03:34:18 +00:00
Baptiste Coudurier
b43bf8acf1 rescale duration when outputting packet 
Originally committed as revision 13845 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-21 03:32:37 +00:00
Baptiste Coudurier
050056d08c log accept error 
Originally committed as revision 13844 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-21 03:31:30 +00:00
Baptiste Coudurier
b4befb99c2 use http_log when log file is setup 
Originally committed as revision 13843 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-21 03:29:59 +00:00
Baptiste Coudurier
0dc17c21ec upgrade bandwidth config to use int64_t, raise limit 
Originally committed as revision 13842 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-21 03:26:24 +00:00
Baptiste Coudurier
1ad8289ede upgrade bandwidth to uint64_t 
Originally committed as revision 13841 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-21 03:23:51 +00:00
Baptiste Coudurier
9507a12e42 add static 
Originally committed as revision 13840 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-21 03:21:29 +00:00
Stefano Sabatini
dca2108541 Cosmetics: s/stats/status/ in ffserver.c. 
Originally committed as revision 13809 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-19 07:10:44 +00:00
Baptiste Coudurier
7ab088648b add AVOption support in ffserver configuration file 
Originally committed as revision 13719 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-09 00:25:33 +00:00
Stefano Sabatini
59c2959d07 use unsetenv, fix warning, patch by Stefano Sabatini, stefano dot sabatini-lala at poste dot it 
Originally committed as revision 13707 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-07 23:56:00 +00:00
Stefano Sabatini
17b01199f0 use program_name to be more consistent with the banner, patch by Stefano Sabatini, stefano dot sabatini-lala at poste dot it 
Originally committed as revision 13706 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-07 23:49:26 +00:00
Baptiste Coudurier
2dae1dd0dd add \n to error message 
Originally committed as revision 13592 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-01 02:01:22 +00:00
Baptiste Coudurier
180b7026b9 2nd try fix got_key_frame when video+audio 
Originally committed as revision 13559 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-30 17:53:50 +00:00
Baptiste Coudurier
78728064c3 fix got_key_frame when stream is audio 
Originally committed as revision 13552 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-30 02:32:58 +00:00
Baptiste Coudurier
0332f54945 set got_key_frame when packet is video, fix first video packet with index 0 and 2 streams 
Originally committed as revision 13551 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-30 02:26:07 +00:00
Baptiste Coudurier
3766ed7214 log error when writing frame to output 
Originally committed as revision 13548 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-30 01:46:57 +00:00
Baptiste Coudurier
c1593d0e56 wake up connections to stop waiting when feed is being closed 
Originally committed as revision 13547 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-30 01:46:06 +00:00
Baptiste Coudurier
084a891292 fix timestamps rescaling, index in source format might be different 
Originally committed as revision 13546 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-30 01:44:35 +00:00
Baptiste Coudurier
929a9b7544 log some errors 
Originally committed as revision 13544 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-30 00:50:39 +00:00
Baptiste Coudurier
58bd615ff5 set is_streamed before writing data to output file 
Originally committed as revision 13543 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-30 00:21:42 +00:00
Baptiste Coudurier
3b37167691 cosmetics, reindent 
Originally committed as revision 13541 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-29 23:11:25 +00:00
Baptiste Coudurier
1cb4d12c72 cosmetics, move declaration where it is used, remove now useless block 
Originally committed as revision 13540 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-29 23:09:29 +00:00
Baptiste Coudurier
369074680e use av_parse_video_frame_rate 
Originally committed as revision 13537 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-29 17:24:22 +00:00
Diego Biurrun
1ab05d37ff Remove unnecessary #include. 
Originally committed as revision 13532 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-29 15:13:47 +00:00
Erik Hovland
f094b6627d Remove unnecessary header #includes. 
Extracted from a patch by Erik Hovland, erik hovland org.

Originally committed as revision 13531 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-29 13:40:43 +00:00
Stefano Sabatini
ea9c581f61 Simplify show_banner() so that it does not require arguments, similar 
to what was previously done with show_version().
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13526 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-29 08:48:51 +00:00
Baptiste Coudurier
9667a2d268 reindent 
Originally committed as revision 13525 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-29 02:32:02 +00:00