1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Commit Graph

4450 Commits

Author SHA1 Message Date
Stefano Sabatini
7619a87cc8 lavfi/volume: support volume expression and per-frame expression evaluation
The eval mode allows to evaluate the expression per-frame or just at
init.

In particular, address ticket #3234.
2013-12-25 18:25:04 +01:00
Michael Niedermayer
5a8b4ed580 Merge commit '57ead8449e44bd07b3d4a5bd42f1aab64566f92e'
* commit '57ead8449e44bd07b3d4a5bd42f1aab64566f92e':
  doc: fix link to the ISC license text in the developer documentation.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-23 12:52:50 +01:00
Michael Niedermayer
5b4c7b7dcf Merge commit '6c0e83511705e7f8f5100e7852a1e7fd16aa8877'
* commit '6c0e83511705e7f8f5100e7852a1e7fd16aa8877':
  doc: fix a coding style error in the developer documentation.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-23 11:58:36 +01:00
Tim Walker
57ead8449e doc: fix link to the ISC license text in the developer documentation. 2013-12-22 22:35:11 +01:00
Tim Walker
6c0e835117 doc: fix a coding style error in the developer documentation. 2013-12-22 22:34:58 +01:00
Michael Niedermayer
911676c643 avutil/avstring: add av_strnlen()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-22 22:25:15 +01:00
Michael Niedermayer
6fe5f770db Merge commit 'be7c323176e2e5fcf30e3d2ff20975b2f936811b'
* commit 'be7c323176e2e5fcf30e3d2ff20975b2f936811b':
  Add a libwebp encoder

Conflicts:
	Changelog
	doc/encoders.texi
	doc/general.texi
	libavcodec/version.h
	libavformat/img2enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-22 11:53:41 +01:00
Justin Ruggles
be7c323176 Add a libwebp encoder 2013-12-21 17:01:42 -05:00
Ilya Basin
d1b8e01ef1 examples/muxing: fix memleaks in resampler
- do not allocate resample dst buffer when resample is off
  - free sample buffers in addition to freeing data pointer arrays

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-21 12:22:49 +01:00
Ilya Basin
7d1d0b3ecf examples/muxing: use S16 sample_fmt for resample src regardless of codec sample_fmt
We generate S16 samples and we should allocate the right buffer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-21 12:21:05 +01:00
Ilya Basin
b6714fa077 examples/muxing: fix av_frame_free() not called when got_packet is false
Hi list! Since my last patch (fix 2 memleaks in doc/examples/muxing.c)
I found more problems to fix.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-21 12:20:44 +01:00
Michael Niedermayer
d6b7ea06f1 Merge commit '2a41826bea3833895dc06939831b7f35ca1f597e'
* commit '2a41826bea3833895dc06939831b7f35ca1f597e':
  lavc: add HEVC profiles names

Conflicts:
	libavcodec/hevc.c
	libavcodec/version.h

See: fb7d70c1cd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-21 00:24:43 +01:00
Gildas Cocherel
2a41826bea lavc: add HEVC profiles names
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-12-20 19:35:27 +01:00
Anton Khirnov
fe533ffdcf Prepare release notes for Libav 10 "Eks"
Additional editing by Diego Biurrun
2013-12-18 09:18:42 -05:00
Michael Niedermayer
645c94b61b Revert "Merge commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c'" (Bump libavutil major version to account for the LLS API/ABI changes.)
This reverts commit 792845e436, reversing
changes made to 1d6666a6b8.

Bumping libavutil requires all libraries that use libavutil to have their
major version bumped (yes breakage has been confirmed this is not a hypotheses)

One case of breakage is due to new types being added to AVOptions and
applications that linked to old libavutil and libswresample
then trying to use old libavutil (its soname changed so the old isnt updated)
and new swresample (its soame didnt change so it is updated)
the new swresample contains AVOption types that the old libavutil doesnt
know of thus the application attempting to access these avoptions
fails

AVOptions are used by all libs so the issue can potentially happen with
any other lib, libswresample was just the first that showed the problem
ive not checked if the other libs are affected currently by the same issue
or not

Also in addition to AVOptions, AVFrames are also defined in
libavutil, bumping it without all libs that use AVFrames could lead to
serious inconsistencies when 2 libs/app end up using 2 different libavutils

The alternative of bumping all is still possible after this revert, if it
turns out to be the preferred solution
2013-12-18 03:05:25 +01:00
Michael Niedermayer
a788949255 Merge commit '6d3ea1957f681b3bf9c752e6d21a501cc8d4180d'
* commit '6d3ea1957f681b3bf9c752e6d21a501cc8d4180d':
  Bump major of libavfilter for reference counted buffer API changes.

Conflicts:
	libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-16 22:07:24 +01:00
Michael Niedermayer
792845e436 Merge commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c'
* commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c':
  Bump libavutil major version to account for the LLS API/ABI changes.

Conflicts:
	libavutil/version.h

Bump done to stay compatible with libav, its not neccessary otherwise for ffmpeg
as we have the new ABI/API under LLS2 and the old (unused) under LLS

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-16 21:52:51 +01:00
Stefano Sabatini
9985710a5a ffserver: add stream Metadata option
Also deprecate Author, Comment, Copyright, and Title options, and update
docs to use the new Metadata option.
2013-12-16 19:18:45 +01:00
Stefano Sabatini
b2a4316287 examples/decoding_encoding: check av_samples_get_buffer_size() for a negative value
Fix broken != 0 check.
2013-12-15 20:09:26 +01:00
Stefano Sabatini
81eff6e7a2 doc/muxers/tee: add example showing second level escaping 2013-12-15 20:04:06 +01:00
Stefano Sabatini
2364b4031d doc/muxers/tee: use @ref to reference other sections 2013-12-15 20:04:06 +01:00
wm4
5f6c21117f ffprobe: show best_effort_timestamp in the frame section
This is useful for debugging.

Reference and ffprobe.xsd changes done and tested by Stefano Sabatini.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-12-15 10:46:46 +01:00
Reinhard Tartler
6d3ea1957f Bump major of libavfilter for reference counted buffer API changes.
Applications that have been linked against an older release of Libav and pick up
updated libraries experience segmentation faults because they pick up the new
libavfilter, which assumes AVFrames have been allocated by libavutil and thus
contain new reference-counting related fields. This will break for AVFrames that
have been allocated by old libavcodec.

All scheduled API changes are deferred to the next bump.
2013-12-14 16:31:32 -05:00
Reinhard Tartler
3bc2e89c76 Bump libavutil major version to account for the LLS API/ABI changes.
Commit 41578f70cf changed the LLS API, which was
called from libavcodec. Thus using an old libavcodec with a new libavutil will
break.

All scheduled API changes are deferred to the next bump.
2013-12-14 16:31:09 -05:00
Stefano Sabatini
de9ea40a40 doc/bitstream_filters: remove mp3_header_decompress filter
It was removed in commit c6080d8900.
2013-12-14 21:47:51 +01:00
Timothy Gu
c65fe9e982 examples/decoding_encoding: check av_samples_get_buffer_size() return code
Fixes CID1135756.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-12-14 14:02:49 +01:00
Timothy Gu
b242c156e5 examples/resample_audio: check av_samples_get_buffer_size() return code
Fixes CID1135757.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-12-14 14:02:33 +01:00
Clément Bœsch
b02d87936b examples/demuxing_decoding: print the decoding error when it happens. 2013-12-13 10:37:20 +01:00
Even Wiik Thomassen
43f116d162 examples/demuxing_decoding: return error when no codec found
The open_codec_context function, when it fails to find a codec, now
return AVERROR(EINVAL) to signal an error.

Before it would return the stream index, which was always >= 0, and
continue as if a codec was found. This change make it fail faster,
instead of repeated failed tries to decode frames with no codec.

Signed-off-by: Even Wiik Thomassen <e.thomassen@sportradar.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-12-13 09:45:54 +01:00
Lou Logan
d546a59a81 docs/outdevs: add a few simple ALSA examples 2013-12-12 18:21:52 -09:00
Michael Niedermayer
44967ab60a Merge commit 'd7b3ee9a3a03ab88d61a5895fbdbc6689f4dd671'
* commit 'd7b3ee9a3a03ab88d61a5895fbdbc6689f4dd671':
  lavc: deprecate avcodec_get_frame_defaults().

Conflicts:
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-12 00:32:15 +01:00
Michael Niedermayer
525a7d9b78 Merge commit '48d17ee6dc2b2a552f645484f200c2946bf24607'
* commit '48d17ee6dc2b2a552f645484f200c2946bf24607':
  api-example: remove an unneeded call to avcodec_get_frame_defaults().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-12 00:19:53 +01:00
Michael Niedermayer
4cbf3eb9e6 Merge commit 'eb891b3114f499e96b9faddd0b0ae856345dfbd9'
* commit 'eb891b3114f499e96b9faddd0b0ae856345dfbd9':
  Replace all uses of avcodec_free_frame with av_frame_free().

Conflicts:
	doc/examples/decoding_encoding.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-11 23:18:51 +01:00
Anton Khirnov
d7b3ee9a3a lavc: deprecate avcodec_get_frame_defaults().
Also bump libavcodec micro and add an APIchanges entry saying that
av_frame_* should now be used instead of the lavc AVFrame functions.
2013-12-11 20:39:55 +01:00
Anton Khirnov
eb891b3114 Replace all uses of avcodec_free_frame with av_frame_free(). 2013-12-11 20:39:54 +01:00
Carl Eugen Hoyos
aae5c4d40e doc: Fix adelay example.
Fixes ticket #3211.
2013-12-09 23:56:23 +01:00
Michael Niedermayer
7a60348053 Merge commit '7e244c68600f479270e979258e389ed5240885fb'
* commit '7e244c68600f479270e979258e389ed5240885fb':
  avframe: add codec-independent stereoscopic metadata

Conflicts:
	Changelog
	libavutil/Makefile
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-09 21:33:51 +01:00
Lenny Wang
64f73acd1d cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices
Reviewed-by: Wei Gao <highgod0401@gmail.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-09 21:21:36 +01:00
Vittorio Giovara
7e244c6860 avframe: add codec-independent stereoscopic metadata 2013-12-09 16:02:43 +01:00
Stefano Sabatini
e424abc3a0 lavfi: add aeval filter 2013-12-06 10:57:26 +01:00
Stefano Sabatini
405b3eb535 lavfi/aevalsrc: duplicate last expression for the missing channels
Use last expression for the missing channel expressions in case the
channel layout was specified. Enhance flexibility.
2013-12-06 10:51:12 +01:00
Stefano Sabatini
5b073da7a1 doc: add script to compute texi files dependencies
Replace the inline awk script with a Perl script which tracks the
dependencies recursively.

This allows to correctly track dependencies for files including files
with a second level include (for example: ffmpeg-devices.texi ->
devices.texi -> outdevs.texi).

This also adds a dependency on perl for computing the dependencies, which
should not be a problem since perl is already required all the way for
building documentation.

This is a variant of commit 628ceac652
which was reverted due to out-of-tree build failure.
2013-12-06 10:40:38 +01:00
Michael Niedermayer
210a78aeb5 doc/examples/filtering_audio: init packet0.data
Fixes use of uinitialized data and crash

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-03 00:01:07 +01:00
Stefano Sabatini
6ca0ac5e55 doc/ffserver: remove spurious NoAudio option from stream example 2013-12-02 23:52:24 +01:00
Stefano Sabatini
c490cd4c1a doc/examples/filtering_audio: fix chunked audio decoding
Support the case when multiple frames are contained in a single packet.
In particular, fix fate-samples/lossless-audio/luckynight-partial.shn
sample decoding.
2013-12-02 15:21:52 +01:00
Stefano Sabatini
893f33e7f0 doc/examples/filtering_audio: fix style 2013-12-02 15:08:00 +01:00
Stefano Sabatini
c7a99d99bd doc/examples/filtering_video: do not make use of AVBufferSinkParams
Set the value on the filter context instead. Simplify.
2013-12-02 14:35:40 +01:00
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