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,633 Commits 37 Branches 400 Tags 460 MiB
92225877ce
Commit Graph

4528 Commits

Author SHA1 Message Date
Werner Robitza
1ffac25d31 doc/filters/histogram: copyedit for grammar 
There were a few grammar and spelling mistakes in this filter
description. I went through it and corrected them without changing
the meaning.
 2014-02-14 15:11:46 +00:00
Michael Niedermayer
fba1592f35 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  doc/examples: misc Doxygen markup improvements

Conflicts:
	doc/examples/muxing.c
	doc/examples/transcode_aac.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-14 15:31:14 +01:00
Michael Niedermayer
71052d85c1 Merge commit '3a26ccbf0d9f806d067e76a3f484170abecb36b3' 
* commit '3a26ccbf0d9f806d067e76a3f484170abecb36b3':
  build: doxy: Include code examples in Doxygen documentation

Conflicts:
	doc/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-14 15:23:29 +01:00
Michael Niedermayer
cbf09bb63f Merge commit '19d3127867f001d007f98bc8c5a85c5409abf788' 
* commit '19d3127867f001d007f98bc8c5a85c5409abf788':
  doxygen: Set EXAMPLE_PATH from within doxy-wrapper.sh

Conflicts:
	doc/Doxyfile
	doc/doxy-wrapper.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-14 15:12:32 +01:00
Michael Niedermayer
2fd0b5bd60 Merge commit 'f1f42cfc66804907d1df9231469e4296472bb0f5' 
* commit 'f1f42cfc66804907d1df9231469e4296472bb0f5':
  build: Do not pass HTML snippets and stylesheet as input to Doxygen

Conflicts:
	doc/Makefile

See: 0f378d8632
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-14 14:53:54 +01:00
Michael Niedermayer
c0c6f9aba5 Merge commit 'e6c175dfd51e4b0e6deeae72cd8a161b22af3492' 
* commit 'e6c175dfd51e4b0e6deeae72cd8a161b22af3492':
  Doxyfile: Only set HTML_{HEADER|FOOTER|STYLESHEET} from doxy_wrapper.sh

Conflicts:
	doc/Doxyfile

See: 7d0ca5b7e4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-14 14:38:21 +01:00
Diego Biurrun
0b9716c455 doc/examples: misc Doxygen markup improvements 
Add properly formatted @example tag and fix Doxygen syntax.
 2014-02-14 12:01:36 +01:00
Diego Biurrun
3a26ccbf0d build: doxy: Include code examples in Doxygen documentation 2014-02-14 12:01:35 +01:00
Diego Biurrun
19d3127867 doxygen: Set EXAMPLE_PATH from within doxy-wrapper.sh 
This allows using the libav source path as the example path.
 2014-02-14 12:01:35 +01:00
Diego Biurrun
f1f42cfc66 build: Do not pass HTML snippets and stylesheet as input to Doxygen 
These files are referenced elsewhere and only generate warnings if
presented to Doxygen as input files.
 2014-02-14 12:01:35 +01:00
Diego Biurrun
e6c175dfd5 Doxyfile: Only set HTML_{HEADER|FOOTER|STYLESHEET} from doxy_wrapper.sh 2014-02-14 11:07:35 +01:00
Derek Buitenhuis
50ea93158d Add libx265 encoder 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-02-12 13:13:17 +00:00
Derek Buitenhuis
bb6b1731eb Add libx265 encoder 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-02-12 13:12:22 +00:00
Nicolas George
edc7e67669 lavf/lavd: version bump and APIchanges for uncoded frames. 2014-02-11 10:34:32 +01:00
Michael Niedermayer
e93674c4a3 doc/APIchanges: fill in FFmpeg hashes & versions 
Entries that have no hash at all are not filled in

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 19:10:12 +01:00
Michael Niedermayer
1c1bb203dd Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  build: fix examples compilation when EXESUF is not empty

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 14:24:15 +01:00
Michael Niedermayer
6fb8684a24 Merge commit 'b36bc81ccaa2fc85dc4bae7dc546c71e8833573d' 
* commit 'b36bc81ccaa2fc85dc4bae7dc546c71e8833573d':
  avplay: add support for seeking to chapter marks

Conflicts:
	doc/ffplay.texi
	ffplay.c

ffplay uses pageup/down for seeking by +-10min
thus this use of the keys conflicts.
The merge thus uses them to seek to chapters when there are some or
+-10min when there are not

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 13:26:31 +01:00
Christophe Gisquet
682b2a809b build: fix examples compilation when EXESUF is not empty 
Due to a wrong substitution doc/examples is not added as a prerequisite
for the objects of the example programs. This results in compiler error
due to the non-existing output directory.

Bug-Id: 636

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2014-02-10 13:23:21 +01:00
Michael Niedermayer
2e99867a4e Merge commit 'd711d839ca6714a5ef5b53ee51bc7632e62cf203' 
* commit 'd711d839ca6714a5ef5b53ee51bc7632e62cf203':
  doc/APIchanges: fill in missing hashes and dates

Conflicts:
	doc/APIchanges

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 12:17:35 +01:00
Anton Khirnov
b36bc81cca avplay: add support for seeking to chapter marks 2014-02-10 11:23:01 +01:00
Anton Khirnov
d711d839ca doc/APIchanges: fill in missing hashes and dates 2014-02-10 07:29:27 +01:00
Anton Khirnov
cca4742a5e doc/APIchanges: mark the place where 9 was branched 2014-02-10 07:29:27 +01:00
Ramiro Polla
5965adeb20 lavd: add decklink output device 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-09 17:15:19 +01:00
Michael Niedermayer
0c4bf87b29 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Mirillis FIC video decoder

Conflicts:
	Changelog
	configure
	libavcodec/Makefile
	libavcodec/avcodec.h
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-08 19:02:46 +01:00
Kostya Shishkov
cde7df25ef Mirillis FIC video decoder 
Does not contain cursor rendering yet.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-02-08 15:04:13 +00:00
Clément Bœsch
f21d0beb0c Fix a few heigth/height typo. 2014-02-07 09:33:56 +01:00
Timothy Gu
474db7a696 doc/texi2pod: make references bold 
Inspired by GCC r86635.

This is more consistent with other man pages. For example in `man git`,
all the "git-help(1)" kind of cross refs are bold.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-06 16:18:26 +01:00
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