Timothy Gu
82b2e9cb1d
build: rename version.h to libavutil/ffversion.h
...
Also the libavutil/ffversion.h will be installed.
Rationale:
* Applications might want to know FFmpeg's version besides the individual
libraries'.
* Avoids file name clash between FFmpeg's ./version.h and lib*/version.h when
a library source file includes both and is compiled on an out-of-tree build.
Fixes #1769 .
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-30 21:42:55 +01:00
Stefano Sabatini
f2f17dd874
doc/ffserver: clarify documentation for Feed MaxFileSize option
2013-11-30 14:47:26 +01:00
Stefano Sabatini
8209dd332f
doc/ffserver: clarify that note in NoDaemon option documentation
2013-11-30 14:46:53 +01:00
Stefano Sabatini
889509d241
doc/ffserver: add "Detailed description" chapter
...
Also move FFM section up in the file, and rename it.
2013-11-30 14:35:33 +01:00
Stefano Sabatini
0bacc320c2
doc/ffserver: remove more mentions to LAME and build
2013-11-30 14:35:33 +01:00
Stefano Sabatini
0d640c08eb
doc/ffserver: specify missing argument for ACL feed option
2013-11-29 10:28:03 +01:00
Stefano Sabatini
6dac34b853
doc/ffserver: fix RTSPOtion tpo
...
Spotted-by: ubitux
2013-11-29 10:28:03 +01:00
Stefano Sabatini
98e47c1a7e
doc/ffserver: extend documentation for Feed/File stream options
2013-11-29 10:28:03 +01:00
Stefano Sabatini
0e64edda18
doc/ffserver: uncomment line in stream section example
2013-11-29 10:28:03 +01:00
Stefano Sabatini
cdff4c5313
doc/ffserver: reorder encoding options, and mark them as such
...
Also add notice about ffmpeg -override_ffserver option.
2013-11-29 10:28:03 +01:00
Stefano Sabatini
f87e189ee0
doc/ffserver: extend documentation for various file-related options
2013-11-29 10:28:03 +01:00
Stefano Sabatini
d1daa71f9d
doc/ffserver: mention remaining stream options
2013-11-29 00:04:17 +01:00
Stefano Sabatini
f652f70e32
doc/ffserver: move general stream options upwards in the list
2013-11-29 00:04:17 +01:00
Stefano Sabatini
a42c20f089
doc/ffserver: reorder/extend stream video encoding options
2013-11-29 00:04:17 +01:00
Stefano Sabatini
b9a3ac89c8
doc/ffserver: fix bitrate unit for bitrate option
2013-11-29 00:04:17 +01:00
Stefano Sabatini
6aea3d597e
doc/ffserver: add notice about re-launch behavior
2013-11-28 23:13:46 +01:00
Stefano Sabatini
2a0349786a
doc/ffserver: document InputFormat stream option
2013-11-28 23:13:45 +01:00
Stefano Sabatini
58010e57b2
doc/ffserver: fix documentation for CustomLog
2013-11-28 20:17:15 +01:00
Stefano Sabatini
805b607484
doc/ffserver: extend documentation for VideoBitRateRange
2013-11-28 20:17:10 +01:00
Stefano Sabatini
bcbf8920ed
doc/ffserver: clarify/extend documentation about status streams
2013-11-28 20:17:00 +01:00
Stefano Sabatini
312d075e5d
doc/ffserver: move ACL syntax section before the global option sections
2013-11-28 20:16:53 +01:00
Stefano Sabatini
4e39962f0c
doc/ffserver: document "Launch" feed option
2013-11-28 20:16:46 +01:00
Stefano Sabatini
07315da149
doc/ffserver: fix documentation for -n option
...
Launch option is defined in the Feed section.
2013-11-28 18:59:29 +01:00
Stefano Sabatini
1ee9341a70
doc/ffserver: extend documentation for CustomLog option
2013-11-28 18:59:21 +01:00
Stefano Sabatini
2121945770
doc/ffserver: fix RTPS -> RTSP ttypo
...
Spotted-by: lazy ubitux
2013-11-28 17:28:27 +01:00
Stefano Sabatini
b89983c4ea
doc/ffserver: clearly specify whence ffserver reads the configuration file
2013-11-28 17:28:22 +01:00
Stefano Sabatini
bb097d037c
doc/ffserver: add notice about case-insensitiveness
2013-11-28 17:13:40 +01:00
Stefano Sabatini
e79f299caf
doc/ffserver: remove tip about MaxBandwidth
...
Should be redundant now that the option is documented.
2013-11-28 17:13:35 +01:00
Stefano Sabatini
398479050e
doc/ffserver: specify default value for Preroll
2013-11-28 17:13:27 +01:00
Stefano Sabatini
2989281d4d
doc/ffserver: document NoDaemon deprecated option
2013-11-28 17:03:09 +01:00
Stefano Sabatini
0003379926
doc/ffserver: improve rendering for -n option text
2013-11-28 17:03:09 +01:00
Stefano Sabatini
6dc90334e3
doc/ffserver: remove "What can this do?" section
...
The section shows only a limited use case, contains only redundant
information, and various mysterious mentions about things which don't
work correctly.
2013-11-28 17:03:09 +01:00
Stefano Sabatini
80193a12e0
doc/ffserver: use @command{} for specifying ffserver
2013-11-28 17:03:09 +01:00
Stefano Sabatini
39192b76f8
doc/ffserver: remove more pointless/outdated entries
...
Mentioning build options, or bugs, or mysterious limitations should not
be done in the manual.
2013-11-28 17:03:08 +01:00
Clément Bœsch
01c9d8094a
doc/Makefile: cosmetics after previous commits.
2013-11-28 14:10:34 +01:00
Clément Bœsch
0d2c832445
doc/examples: update README.
2013-11-28 14:08:06 +01:00
Clément Bœsch
1d751768f3
build: also clean the examples with debug symbols
2013-11-28 14:06:57 +01:00
Clément Bœsch
fe318e143b
build: split examples cleaning out of docclean.
2013-11-28 13:56:08 +01:00
Clément Bœsch
1a88e84fd5
build: integrate remaining examples.
2013-11-28 13:55:34 +01:00
Clément Bœsch
a8ac2a1530
doc/examples: make fill_samples static.
...
This is required to build with FFmpeg compilation options.
2013-11-28 13:54:44 +01:00
Clément Bœsch
e5102feb6b
doc/examples: add transcode_aac to local Makefile.
2013-11-28 13:19:50 +01:00
Timothy Gu
a212d66c2a
doc/default.css: sync with ffmpeg-web
...
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-11-28 10:27:25 +01:00
Stefano Sabatini
15f2cac018
doc/ffserver: remove outdated troubleshoot entry about audio
2013-11-28 10:19:12 +01:00
Stefano Sabatini
c4a03ac3b8
doc/ffserver: document configuration syntax
...
While still incomplete, this is better than nothing at all.
2013-11-28 10:18:55 +01:00
Stefano Sabatini
6b58488f92
doc/ffmpeg: use @command{} for programs mentioned in -override_ffserver
2013-11-27 15:48:19 +01:00
Derek Buitenhuis
ec0b0c2b58
doc/platform: Update to reflect current MSVC build situation
...
Also update the C99 converter URL, since it uses GitHub Releases
to host the binaries now.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-11-27 13:39:42 +00:00
Michael Niedermayer
ba728c1a25
doc/examples/transcode_aac: remove non converted codepath
...
This codepath is not implemented and just crashes, also its simpler
without special cases, which makes sense for an example
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-27 11:22:19 +01:00
Michael Niedermayer
7497c894cd
doc/examples/transcode_aac: switch to swresample
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-27 11:15:48 +01:00
Michael Niedermayer
02abc905cd
doc/examples/transcode_aac: fix project name
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-27 10:52:05 +01:00
Michael Niedermayer
715f3623f8
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
Add an audio transcoding example.
Conflicts:
configure
doc/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-27 10:31:08 +01:00
