virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
60,842 Commits 37 Branches 400 Tags 460 MiB
42361bdf51
Commit Graph

4551 Commits

Author SHA1 Message Date
Timothy Gu
4a37e2977c libfdk-aacenc: disable hard version requirements 
Enable compilation on machines with an old libfdk-aac.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-06 02:33:33 +01:00
Michael Niedermayer
3adb5f8d8b Merge commit 'd9ae1031f5edbd25c8526b4cb51aba66d3bee931' 
* commit 'd9ae1031f5edbd25c8526b4cb51aba66d3bee931':
  lavf: improve handling of sparse streams when muxing

Conflicts:
	doc/APIchanges
	libavformat/avformat.h
	libavformat/mux.c
	libavformat/options_table.h
	libavformat/version.h

See: 37ed5df5c5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-05 03:19:22 +01:00
Luca Barbato
d9ae1031f5 lavf: improve handling of sparse streams when muxing 
Currently ff_interleave_packet_per_dts() waits until it gets a frame for
each stream before outputting packets in interleaved order.

Sparse streams (i.e. streams with much fewer packets than the other
streams, like subtitles or audio with DTX) tend to add up latency and in
specific cases end up allocating a large amount of memory.

Emit the top packet from the packet_buffer if it has a time delta
larger than a specified threshold.

Original report of the issue and initial proposed solution by
mus.svz@gmail.com.

Bug-id: 31
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-02-04 22:01:42 +01:00
Michael Niedermayer
905cd28a5a Merge commit 'de203abd71baae7f120313259b45cf935c85203e' 
* commit 'de203abd71baae7f120313259b45cf935c85203e':
  vf_overlay: add eof_action switch

Conflicts:
	doc/filters.texi
	libavfilter/vf_overlay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-04 14:33:33 +01:00
Keith Lawson
de203abd71 vf_overlay: add eof_action switch 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-02-04 10:54:26 +01:00
Jean First
2384cada12 lavfi/ebur128: add true peak metering per frame 
Signed-off-by: Jean First <jeanfirst@gmail.com>
 2014-02-02 20:45:09 +01:00
Jean First
6ef2315aaf lavfi/ebur128: print peak metering in dBFS 
Signed-off-by: Jean First <jeanfirst@gmail.com>
 2014-02-02 20:45:09 +01:00
Clément Bœsch
7f42bfad5d lavfi/ebur128: add sample and true peak metering. 
Metadata injection and logging. Not yet present visually.

Signed-off-by: Jean First <jeanfirst@gmail.com>
 2014-02-02 20:44:56 +01:00
Stefano Sabatini
bf96e547b7 doc/APIchanges: fix weird reindent 2014-02-02 13:16:28 +01:00
Stefano Sabatini
5871ee5072 lavf: add output_ts_offset option to AVFormatContext 
This option can be generally useful to set an output offset, needed when
setting an absolute index in the output.
 2014-02-02 13:16:17 +01:00
Stefano Sabatini
60251c13e3 examples/avio_reading: remove stray empty line 2014-02-02 12:35:46 +01:00
Stefano Sabatini
5fc4dea39c examples: add avio_reading.c example 2014-02-02 11:58:23 +01:00
Stefano Sabatini
a270f63e83 lavfi/overlay: add yuv422 format mode 2014-02-02 11:50:21 +01:00
Michael Niedermayer
a85a718f26 doc/examples/decoding_encoding: Check all av_samples_get_buffer_size() returns 
Fixed CID1135755
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-31 03:27:37 +01:00
Stefano Sabatini
4111856545 doc/APIchanges: apply minor formatting fixes 2014-01-31 00:48:31 +01:00
James Darnley
9a6d91b6b6 Changelog: add entries relating to metadata_header_padding 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-30 20:37:07 +01:00
Michael Niedermayer
6dc9d2cf47 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  doc: document correct option to list encoders

Conflicts:
	doc/encoders.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-30 16:00:47 +01:00
Michael Niedermayer
d85284d4aa Merge commit 'a17ab0e46a9fec7c31cc1be363828184c6ecebf7' 
* commit 'a17ab0e46a9fec7c31cc1be363828184c6ecebf7':
  doc: add decoders.texi

Conflicts:
	doc/decoders.texi
	doc/ffmpeg.texi
	doc/ffplay.texi

See: 5e45f03420
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-30 15:19:51 +01:00
John Stebbins
64ba831da9 doc: document correct option to list encoders 2014-01-29 23:27:37 +01:00
John Stebbins
a17ab0e46a doc: add decoders.texi 
Only documents ac3 decoder options at this point.
 2014-01-29 23:27:18 +01:00
Lukasz Marek
406cb21b63 doc/general: update device and protocol status 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-28 17:58:22 +01:00
Lukasz Marek
4115cd0e76 doc/APIchanges: add avdevice_*_control_message functions 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-28 15:30:45 +01:00
Lukasz Marek
ded6b3af41 lavd: add opengl device 
It can render to OpenGL context provided by application or into SDL window

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2014-01-27 15:18:18 +01:00
Stefano Sabatini
68c5ba1f05 doc/filters: re-edit notes on filtergraph escaping 
State the escaping rules more explicitly, reword various sentences and
drop confusing quoting example.

Should fix trac issue #3334.
 2014-01-26 18:06:39 +01:00
Lars Kiesow
c49b036096 Documentation for scale filter factor 2014-01-25 15:34:23 +01:00
Ramiro Polla
78a9f185eb lavfi/drawtext: add option for drawing border around text 
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-25 04:59:28 +01:00
Ramiro Polla
222fb8276d lavfi/drawtext: get bitmap from glyph in a separate step 
This change makes it possible to transform the glyph or get its border before
turning it into a bitmap.

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-25 04:46:38 +01:00
Stefano Sabatini
ca57659440 examples/filtering_audio,video: do not call avcodec_register_all() 
It is implied by av_register_all(). Simplify.
 2014-01-24 12:20:46 +01:00
Stefano Sabatini
433b153b68 doc/ffmpeg: reference time syntax sections in ffmpeg-utils for itsoffset and timestamp options 
Avoid doc duplication and desynching.
 2014-01-24 12:20:46 +01:00
Stefano Sabatini
35fe88bb51 examples/muxing: reindent after previous commit 2014-01-23 01:08:24 +01:00
Stefano Sabatini
c92d2f98db examples/muxing: flush encoders at the end 2014-01-23 00:54:33 +01:00
Lukasz Marek
7e8f304846 lavf/libssh: add private_key option 
Allows to specify private key to use during authorization.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2014-01-22 00:41:13 +01:00
Stefano Sabatini
b539a72bba examples/filtering_audio,video: drop call to avcodec_get_frame_defaults() 
The avcodec_get_frame_defaults() function is deprecated and its use
doesn't seem required.
 2014-01-21 20:08:36 +01:00
Stefano Sabatini
e34ad128a3 examples/muxing: reduce duration, remove wrong and misleading comment 
Set duration to 10 seconds, after it was increased from 5 to 200 seconds
in 8d80f3cb87.

200 seconds will generate too much data which is annoying especially when
testing.
 2014-01-21 11:52:14 +01:00
Michael Niedermayer
eef74b2e97 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavc: deprecate CODEC_FLAG_EMU_EDGE and avcodec_get_edge_width().

Conflicts:
	doc/APIchanges
	libavcodec/utils.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-20 18:55:22 +01:00
Stefano Sabatini
9ab8f3738a examples/muxing: remove redundant {} 2014-01-20 13:10:10 +01:00
Stefano Sabatini
b933c72b5e examples/muxing: change error checks, from "ret != 0" to "ret < 0" 
More consistent and more future-proof.
 2014-01-20 13:10:10 +01:00
Stefano Sabatini
d72c742d47 examples/muxing: factorize write_interleave code 
Also log output packet information.
 2014-01-20 13:10:10 +01:00
Stefano Sabatini
5e2b8e4934 examples: add remuxing example 
Show how to perform streamcopy from one container to another.
 2014-01-20 13:10:10 +01:00
Anton Khirnov
93c553c71e lavc: deprecate CODEC_FLAG_EMU_EDGE and avcodec_get_edge_width(). 2014-01-20 12:52:28 +01:00
wm4
1a193c438c lavf: add avformat_get_mov_video_tags() and avformat_get_mov_audio_tags() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-19 22:15:32 +01:00
Nicolas George
3532dd52c5 lavu/rational: add syntactic sugar. 
Add a function to create a rational
and macros for common values.
 2014-01-19 17:12:22 +01:00
Timothy Gu
5607242155 doc/muxers: add "Options", "Examples", "Syntax", etc. subsections 
More consistent with codec docs. Also some minor reorganization of sentences
to fit the new document hierarchy.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2014-01-19 13:40:37 +01:00
Timothy Gu
093439b481 doc/encoders: add libx264rgb doc and supported pixfmts for libx264(rgb) 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2014-01-19 13:40:32 +01:00
Stefano Sabatini
529573591a doc/muxers/segment: fix formula for computing the segment_time_delta value 2014-01-19 12:20:10 +01:00
Stefano Sabatini
3dc494f8b9 lavfi/vidstabtransform: apply various documentation/option minor fixes 
Improve consistency with the rest of the documentation.
 2014-01-19 12:20:10 +01:00
Michael Niedermayer
58770db2ae Merge commit '33018907bd07b34e0e70d5ae12097265eb3734d7' 
* commit '33018907bd07b34e0e70d5ae12097265eb3734d7':
  mp3enc: allow omitting the id3v2 header with -id3v2_version 0

Conflicts:
	doc/muxers.texi
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-17 15:34:24 +01:00
Michael Niedermayer
5049b6a1fe Merge commit 'f9cc6883a4e5cf72cbfa21d17e1908a2a432f6bd' 
* commit 'f9cc6883a4e5cf72cbfa21d17e1908a2a432f6bd':
  mp3enc: add an option for disabling the Xing frame.

Conflicts:
	doc/muxers.texi
	libavformat/mp3enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-17 15:23:11 +01:00
Anton Khirnov
33018907bd mp3enc: allow omitting the id3v2 header with -id3v2_version 0 2014-01-17 10:30:45 +01:00
Anton Khirnov
f9cc6883a4 mp3enc: add an option for disabling the Xing frame. 2014-01-17 10:30:45 +01:00
Georg Martius
2727dbb053 lavfi/vidstabdetect,vidstabtransform: update to vid.stab 0.98 
In particular:
* set default value for accuracy to 15 (max)
* add zoomspeed for dynamic zoom (optzoom=2)
* make camera path optimization algorithm configurable
* update optzoom documenation in code to use new localmotions calculation function commandline arguments
* add debug option in vidstabtransform

Signed-off-by: Georg Martius <martius@mis.mpg.de>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2014-01-16 12:23:48 +01:00
Stefano Sabatini
d497141b85 examples/muxing: simplify video PTS setting 
Rely on frame_count. Also more consistent with audio path.
 2014-01-12 09:25:48 +01:00
Michael Niedermayer
402a411406 Merge commit 'a7d0e7ead95e584c4866617f046b2493066975c6' 
* commit 'a7d0e7ead95e584c4866617f046b2493066975c6':
  lavfi: add framepack filter

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/allfilters.c
	libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-10 03:00:48 +01:00
Vittorio Giovara
a7d0e7ead9 lavfi: add framepack filter 2014-01-09 23:13:05 +01:00
Maxim Polijakowski
e6f0bb6527 ATRAC3+ decoder 
Cleanup by Diego Biurrun.

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
 2014-01-09 19:33:07 +01:00
Andre Anjos
23ffc4c70d doc/examples/muxing: Fixes frame initialization. 
Fixes use of the example with encoders which use tha AVFrame w/h/pix_fmt fields
FFV1 is one of these codecs

We cannot easily workaround the not set fields in common code because the API
has AVFrame constant for the encoders.
Alternatives would be to fix the API or to duplicate the struct and fill in
missing fields. Or as is to require all user apps to set this correctly and
maybe simplify for that case

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-09 18:12:24 +01:00
Timothy Gu
bba73f5574 doc: remove encoder/muxer/sinks docs from ffplay- and ffprobe-all 
ffplay and ffprobe are read-only.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2014-01-09 12:12:10 +01:00
Stefano Sabatini
094c500caf examples/muxing: set timestamps in output audio packet 
In particular, fix trac ticket #3231.
 2014-01-09 10:54:38 +01:00
Stefano Sabatini
8d22d37e54 examples/muxing: use av_frame_free() in place of av_free() 2014-01-09 10:51:57 +01:00
Stefano Sabatini
9abe4a10fd examples/muxing: reuse global audio frame 
Simplify logic, avoid multiple unnecessary alloc/free operations.
 2014-01-09 10:51:52 +01:00
Stefano Sabatini
80bca6eabe examples/muxing: honour distinction between encoder PTS timebase and stream timebase 
Fix PTS set on the frame when encoding, which must be specified in the
encoder timebase or this will confuse the encoder.

When muxing the packet, the PTS/DTS generated by the encoder is then
rescaled to the stream timebase.
 2014-01-09 10:51:47 +01:00
Stefano Sabatini
eadc421259 examples/muxing: set sample formats from list of codec supported sample formats 
Avoid the need of tweaking, also show how to get list of supported sample
formats.
 2014-01-09 10:51:41 +01:00
Lou Logan
00bef6431e doc/filters: add rotate example using degrees 2014-01-09 00:39:16 +01:00
Stefano Sabatini
2358458a75 doc/muxers/image2: apply several formatting changes 2014-01-08 10:20:42 +01:00
Ramiro Polla
6a99ecb84e doc/muxers/image2: document strftime option 
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2014-01-08 10:10:32 +01:00
Helmut K. C. Tessarek
db70f2d36c doc/muxers/matroska: add information to the matroska metadata language entry 2014-01-08 09:50:57 +01:00
Stefano Sabatini
e9edf001d4 doc/ffmpeg: remove documentation for removed vlang/slang options 2014-01-08 09:47:53 +01:00
Stefano Sabatini
a008deb17b doc/muxers/matroska: reformat documentation 2014-01-08 09:46:51 +01:00
Werner Robitza
53df11eb73 doc/filters/equalizer: add examples for equalizer 
Add two examples on the usage of the equalizer filter.
 2014-01-07 21:10:53 +01:00
Stefano Sabatini
2503928a2f examples/decoding_encoding: fix style nits 2014-01-07 13:08:11 +01:00
Michael Niedermayer
4cf4da9dc5 Merge commit '5b4797a21db900b7d509660b7a4d49829089b004' 
* commit '5b4797a21db900b7d509660b7a4d49829089b004':
  avframe: add AV_FRAME_DATA_MATRIXENCODING side data type.

Conflicts:
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-05 22:12:41 +01:00
Michael Niedermayer
751385fe3f Merge commit '5c437fb' 
* commit '5c437fb':
  lavu: Add values for various Dolby flags to the AVMatrixEncoding enum.

Conflicts:
	doc/APIchanges
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-05 21:55:58 +01:00
Tim Walker
5b4797a21d avframe: add AV_FRAME_DATA_MATRIXENCODING side data type. 
Includes a libavcodec utility function to update a frame's side data.
 2014-01-05 16:41:56 +01:00
Tim Walker
5c437fb672 lavu: Add values for various Dolby flags to the AVMatrixEncoding enum. 2014-01-05 16:41:56 +01:00
Stefano Sabatini
92e145acbb doc/protocols/file: fix semantical reverse 
Change "read" to "write" in introductory description.

Spotted-by: Alexander Strasser <eclipse7@gmx.net>
 2014-01-05 00:43:51 +01:00
Stefano Sabatini
98ecbf0093 doc/protocols/file: document general file protocol URL syntax 
Also drop confusing ff* tools reference about exceptions to the
file:FILENAME syntax, which is not ff* tool specific.

With various edits by Alexander Strasser <eclipse7@gmx.net>.
 2014-01-05 00:43:51 +01:00
Michael Niedermayer
b317f9459f avutil/mathematics: add av_add_stable() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-04 15:10:09 +01:00
Stefano Sabatini
d392619a46 doc/faq: remove "-profile option fails when encoding H.264 video with AAC audio" entry 
The error was fixed in commit ce9bd30379
more than one year ago, and does not affect all the currently supported
versions.

In particular, fix trac issue #1535.
 2014-01-03 17:05:44 +01:00
Stefano Sabatini
d52dd2430b doc/ffserver: mention how to access streams through RTSP 2014-01-03 17:03:43 +01:00
Stefano Sabatini
e3868cc588 doc/muxers/hls: change "can used" to "can be used" 
Spotted-by: Alexander Strasser <eclipse7@gmx.net>
 2014-01-02 09:37:43 +01:00
Michael Niedermayer
0f378d8632 doc/doxy: remove unused files 
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-02 02:17:59 +01:00
Michael Niedermayer
9c29967ae6 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Makefile: add html template files to the doxygen deps

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-02 02:02:21 +01:00
Stefano Sabatini
0aa325457d doc/muxers/segment: clarify ambiguos reference 
Replace "The segmenter muxer" with "This muxer". The "segmenter muxer"
was never defined before, and thus it is a slightly ambiguous term.
 2014-01-02 00:52:01 +01:00
Stefano Sabatini
6cceef2ff9 doc/muxers/segment: reference hls muxer 2014-01-02 00:51:56 +01:00
Stefano Sabatini
f6707f0689 doc/muxers/hls: extend documentation 
In particular, reference segment muxer and clarify difference between
segment filename number and playlist sequence number.

Should fix trac ticket #2601.
 2014-01-02 00:48:36 +01:00
Anton Khirnov
58f0d164de Makefile: add html template files to the doxygen deps 2014-01-01 13:07:57 +01:00
Stefano Sabatini
8c8c3ca91e doc/protocols/rtsp, lavf/rtsp: fix/extend options documentation 2014-01-01 12:57:15 +01:00
Werner Robitza
704c217ff3 ffplay: add documentation for "s" key 
With various edits suggested by Stefano Sabatini and Clément Bœsch.
 2014-01-01 12:57:15 +01:00
Michael Niedermayer
46b06bd894 avcodec/mpegvideo_enc: implement frame skip score normalization 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-01 02:46:39 +01:00
Carl Eugen Hoyos
b4c89c90ff Allow hiding the banner. 
Fixes ticket #3246.
 2013-12-29 22:57:20 +01:00
Timothy Gu
f4c62b9f64 doc/encoders: add wavpackenc doc 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-12-29 13:10:11 +01:00
Timothy Gu
eb38e684b4 doc/encoders: reformat libwavpack documentation 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-12-29 13:10:11 +01:00
Maxim Poliakovski
2e1fb96af3 ATRAC+ decoder 
Cleanup by Diego Biurrun.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-29 01:11:16 +01:00
Michael Niedermayer
7ad6515fd4 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  doxy: Update the css to have a flat style

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-27 13:24:00 +01:00
Michael Niedermayer
8102cdfc04 Merge commit '9ace13db77a22fd59c217175596a95775c5d25aa' 
* commit '9ace13db77a22fd59c217175596a95775c5d25aa':
  doxy: Fix link in badge color

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-27 12:59:35 +01:00
Stefano Sabatini
8ea1501878 doc/protocols: fix level of udp examples subsection 2013-12-27 12:43:35 +01:00
Luca Barbato
1ab91c7d4a doxy: Update the css to have a flat style 
Drop references to the doxy image gradients and style a the code blocks to
keep the whitespace and indent properly.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-12-27 02:53:25 +01:00
Luca Barbato
9ace13db77 doxy: Fix link in badge color 
Green on blue was not exactly optimal.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-12-27 02:53:25 +01:00
Stefano Sabatini
1b4da43ce0 doc/protocols/tcp,lavf/tcp: apply minor fixes to TCP protocol documentation 2013-12-25 18:42:26 +01:00
Stefano Sabatini
b80cf46090 doc/protocols/udp,lavf/udp: apply minor documentation fixes 2013-12-25 18:42:15 +01:00