RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-02 04:52:09 +00:00
Code Issues Projects Releases Wiki Activity
59,360 Commits 37 Branches 400 Tags 246 MiB
1b4da43ce0
Commit Graph

4403 Commits

Author SHA1 Message Date
Stefano Sabatini
3aa6018010 doc/examples/filtering_video: add some error handling in init_filters() 2013-12-02 14:35:39 +01:00
Stefano Sabatini
a12bf9f50f doc/examples/README: fix typo 2013-12-02 14:35:39 +01:00
Stefano Sabatini
55c57658d2 doc/examples/filtering_audio: add more error checks 2013-12-02 14:35:39 +01:00
Stefano Sabatini
82e74ee6e4 doc/examples/filtering: make use of av_err2str() 
Simplify.
 2013-12-02 14:35:31 +01:00
Michael Niedermayer
003f405caf Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  doc: Try to find nonstandard Perl path from the environment

Conflicts:
	doc/texi2pod.pl

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-01 21:50:13 +01:00
Stefano Sabatini
4d028f9280 doc/ffserver: fix misc minor typos 2013-12-01 20:24:49 +01:00
Diego Biurrun
7b05845b15 doc: Try to find nonstandard Perl path from the environment 2013-12-01 12:59:10 -05:00
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
Derek Buitenhuis
fa515c2088 doc/platform: Update to reflect current MSVC build situation 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-11-27 13:39:03 +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
Lukasz Marek
3aaa50a997 lavd/pulse_audio_enc: add buffer size control options 
Add options to control the size of the PulseAudio buffer.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-11-27 10:12:54 +01:00
Andreas Unterweger
10421bcf0a Add an audio transcoding example. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-11-27 09:20:05 +01:00
Michael Niedermayer
5b326f398e doc/Makefile: fix building examples if a program suffix is set 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-27 02:23:55 +01:00
Michael Niedermayer
875f9aea3e Merge commit 'dc80e2f7a529d6e4416b40b68699be16fed62d6c' 
* commit 'dc80e2f7a529d6e4416b40b68699be16fed62d6c':
  Makefile: Fix building programs on systems with a nonempty executable suffix

Conflicts:
	Makefile

See: f1db007e00
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-27 02:09:16 +01:00
Diego Biurrun
92f0abb27f build: Check for pod2man instead of perl for manual page generation 
Some systems provide Perl without pod2man.
 2013-11-26 13:49:06 -08:00
Stefano Sabatini
7de3b1394b lavd/sdl: add event handler thread 
SDL_Init() is called on the event handler thread, as required by SDL in
Windows to avoid deadlocks as discovered by Roger Pack.

Fix trac ticket #1743 and #1744.
 2013-11-26 18:14:52 +01:00
Michael Niedermayer
625b29037e Merge commit '1eaac1d6f7bb8e52d82e1a114c88a59a9a8e5025' 
* commit '1eaac1d6f7bb8e52d82e1a114c88a59a9a8e5025':
  mpeg12dec: Extract CC user data into frame side data

Conflicts:
	doc/APIchanges
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-26 13:00:46 +01:00
Michael Niedermayer
ac021fdc40 Merge commit '56d061ce9da954560892e3551513d5ecc0439846' 
* commit '56d061ce9da954560892e3551513d5ecc0439846':
  metasound: add last missing modes (8kHz @ 6kbps per channel)

Conflicts:
	Changelog
	doc/general.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-26 12:28:31 +01:00
John Stebbins
1eaac1d6f7 mpeg12dec: Extract CC user data into frame side data 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-11-26 08:37:22 +01:00
Kostya Shishkov
56d061ce9d metasound: add last missing modes (8kHz @ 6kbps per channel) 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-11-26 08:29:42 +01:00
Michael Niedermayer
f1db007e00 doc/Makefile fix PROGS 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-26 02:06:59 +01:00
Michael Niedermayer
6d34aa245d Merge commit 'ab81f24ad43bddf77ddd25cba86780c1c884996c' 
* commit 'ab81f24ad43bddf77ddd25cba86780c1c884996c':
  build: Integrate multilibrary examples into the build system

Conflicts:
	configure
	doc/Makefile
	doc/examples/muxing.c
	doc/examples/output.c
	libavformat/Makefile
	libavformat/output-example.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-26 01:31:00 +01:00
Michael Niedermayer
5ded4332f1 Merge commit '14abeaa43d021afdce9119d906891abe89c03b88' 
* commit '14abeaa43d021afdce9119d906891abe89c03b88':
  build: Separate building programs linking against libav* from building av*

Conflicts:
	Makefile
	doc/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-26 01:12:24 +01:00
Diego Biurrun
ab81f24ad4 build: Integrate multilibrary examples into the build system 
This includes moving libavformat/output-example to doc/examples/output.
 2013-11-25 11:57:29 -08:00
Diego Biurrun
14abeaa43d build: Separate building programs linking against libav* from building av* 
This will allow cleaner integration of building example programs.
 2013-11-25 11:57:29 -08:00
Marton Balint
a02860351d ffprobe: add support for subtitle frames 
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-11-25 19:51:27 +01:00
Stefano Sabatini
5e278c19c7 lavf/segment: add segment_list_entry_prefix option 
This option allows to add a prefix to the segment list entry filenames.

Also set by default the list entry filenames to the corresponding
segment basename, consistent with the HLS muxer.

Based on an idea by Steven Liu <lingjiujianke@gmail.com>.
 2013-11-25 19:12:16 +01:00
Martin Storsjö
09cd0a3176 doc: Add the host executable suffix for the print_options dependency 
This fixes building on windows.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-11-25 11:20:55 +02:00
James Almer
eff2edae56 Partially revert "Merge commit 'f187557ab4612776f7f527ecf3d40062975c3e4c'" 
This partially reverts commit c0237d19a0
Some scripts make use of --disable-doc

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-25 01:53:12 +01:00
Stefano Sabatini
8446bb33d1 doc/outdevs/sdl: fix confusing text about window_fullscreen default value 2013-11-24 19:35:36 +01:00
Michael Niedermayer
c0237d19a0 Merge commit 'f187557ab4612776f7f527ecf3d40062975c3e4c' 
* commit 'f187557ab4612776f7f527ecf3d40062975c3e4c':
  build: more fine-grained dependencies for documentation build tools

Conflicts:
	configure
	doc/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-24 04:55:35 +01:00
Diego Biurrun
f187557ab4 build: more fine-grained dependencies for documentation build tools 
Perl is needed to build the manual pages, texi2html for the HTML pages.
 2013-11-23 09:45:06 -08:00
Michael Niedermayer
3e641b4842 Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea' 
* commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea':
  avconv: add support for VDPAU decoding

Conflicts:
	Changelog
	Makefile
	configure
	ffmpeg.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-23 14:46:48 +01:00
Michael Niedermayer
62e10c3759 Merge commit '07fd0a22192805d56c635eb294dc26b0a54ae325' 
* commit '07fd0a22192805d56c635eb294dc26b0a54ae325':
  avconv: add infrastructure for using hwaccels

Conflicts:
	ffmpeg.c
	ffmpeg.h
	ffmpeg_filter.c
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-23 14:31:15 +01:00
Anton Khirnov
7671dd7cd7 avconv: add support for VDPAU decoding 2013-11-23 11:55:53 +01:00
Anton Khirnov
07fd0a2219 avconv: add infrastructure for using hwaccels 2013-11-23 11:55:43 +01:00
Timothy Gu
45ab71a8b8 doc: delete git-howto.txt 
This is already available in Texinfo version.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-11-22 17:26:32 +01:00
Stefano Sabatini
cbba331aa0 ffprobe: implement string validation setting 
This should fix trac tickets #1163, #2502.
 2013-11-22 16:51:56 +01:00
Stefano Sabatini
68590650f0 lavu/avstring: add av_utf8_decode() function 2013-11-22 16:51:05 +01:00
Stefano Sabatini
e2ad4e65a1 doc/encoders/libfdk_aac: state that VBR support is experimental 2013-11-22 14:55:01 +01:00
Stefano Sabatini
9459569897 doc/encoders/libfdk_aac: fix a few typos 2013-11-22 14:55:01 +01:00
Stefano Sabatini
80c85460fd doc/encoders/libfdk_aac: use @ref to reference libfaac 2013-11-22 14:45:43 +01:00
Stefano Sabatini
50a28b1393 doc/examples: do not check NULL values for avcodec_close() 
avcodec_close() does nothing in case the argument is NULL. Simplify.
 2013-11-21 23:29:56 +01:00
Michael Niedermayer
c0caf7e814 Merge commit 'dd249245d012c1eceb57c166e256fc95e74f4bb1' 
* commit 'dd249245d012c1eceb57c166e256fc95e74f4bb1':
  filter docs: reference scale and fps filters

Conflicts:
	doc/filters.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-21 19:09:12 +01:00
Vittorio Giovara
dd249245d0 filter docs: reference scale and fps filters 2013-11-21 14:48:40 +01:00
Ben Boeckel
c28b61caf0 Document new APIs for av_packet_{un, }pack_dictionary() 
Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
Reveiwed-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-20 17:03:19 +01:00
Clément Bœsch
9c8b240806 avfilter/showspectrum: add blackman window. 2013-11-20 16:35:48 +01:00
Clément Bœsch
3e69f7c221 avfilter/showspectrum: add win_func option. 2013-11-20 16:22:05 +01:00
Stefano Sabatini
80e5859d7a doc/muxers/segment: remove wrong default indication for segment_list_flags option 2013-11-19 23:24:54 +01:00
Clément Bœsch
1f7b7d5447 doc/examples: fix mem issues in filtering_video. 2013-11-19 10:31:39 +01:00
Paul B Mahol
74906d3727 avcodec/libopusenc: change default frame duration to 20 ms 
20 ms is used by libopus encoder.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-18 01:46:32 +00:00
Michael Niedermayer
74a8fe9483 doc/ffmpeg: document qscale and video stream special case 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-17 16:08:06 +01:00