Lukasz Marek
5b153f8164
lavf: add SFTP protocol via libssh
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-21 03:26:54 +02:00
Carl Eugen Hoyos
705b30e24f
Improve pullup documentation.
...
Mention that the fps filter should be used after pullup.
2013-09-21 03:24:24 +02:00
Paul B Mahol
1f5d1342ea
doc: Add missing hashes and dates to APIChanges
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-19 16:57:48 +00:00
Paul B Mahol
390c35a13b
lavfi/mp: remove mp=qp
...
The filter does nothing.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-19 15:53:45 +00:00
Michael Niedermayer
b26ccf218d
Merge commit 'c4bfa098072ba338d83555d6e2199f7e1e64ffff'
...
* commit 'c4bfa098072ba338d83555d6e2199f7e1e64ffff':
Add a WebP decoder
Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/version.h
libavformat/img2.c
The previously existing webp decoder is disabled as the new
one supports lossless mode and alpha while the previous does not.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-19 12:36:11 +02:00
Stefano Sabatini
f0606a28de
ffprobe: add -read_intervals option
...
This is also useful to test seeking on an input file.
This also addresses trac ticket #1437 .
2013-09-19 10:10:30 +02:00
Stefano Sabatini
6230a95659
doc/muxers: itemize tee examples
...
Improve rendering.
2013-09-19 10:07:53 +02:00
James Almer
164e0e544f
doc/APIchanges: Fix two hashes
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-18 22:50:52 +02:00
Justin Ruggles
c4bfa09807
Add a WebP decoder
...
Container and lossy decoding by Aneesh Dogra <aneesh@sugarlabs.org>
Lossless decoding by Justin Ruggles <justin.ruggles@gmail.com>
2013-09-18 14:10:05 -04:00
Paul B Mahol
8302abf844
lavfi/mp: remove mp=pullup
...
The filter was ported to a native libavfilter filter.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-18 11:05:27 +00:00
Michael Niedermayer
4d09d2ef9f
doc/APIchanges: List merge commit hashes and version numbers
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-18 01:44:29 +02:00
Michael Niedermayer
7703d19c40
lavf/options_table: improve option help text
...
Contains text suggested by carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-17 19:47:58 +02:00
Paul B Mahol
9c774459a9
avfilter: port pullup filter from libmpcodecs
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-17 17:03:36 +00:00
Michael Niedermayer
0988709673
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
doc: Add missing hashes and dates to APIChanges
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-17 17:09:58 +02:00
Luca Barbato
c38854c399
doc: Add missing hashes and dates to APIChanges
...
Also fix the typo in the last entry version.
2013-09-17 13:31:54 +02:00
Stefano Sabatini
4149981b37
doc/fftools-common-opts: document -help long and full output
2013-09-17 12:30:40 +02:00
Michael Niedermayer
c74c3fb142
Merge commit '3feb3d6ce4be0a09a9f8f13d613bed25b523b6e7'
...
* commit '3feb3d6ce4be0a09a9f8f13d613bed25b523b6e7':
mem: Introduce av_reallocp
Conflicts:
doc/APIchanges
libavutil/mem.c
libavutil/mem.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-17 11:06:26 +02:00
Luca Barbato
3feb3d6ce4
mem: Introduce av_reallocp
2013-09-16 19:36:37 +02:00
Timothy Gu
b7dd459863
doc/formats: Add documentation for 3 parameters that have been missing
...
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-16 17:49:10 +02:00
Paul B Mahol
9d05de2258
avfilter: add adelay filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-16 14:33:07 +00:00
Timothy Gu
81bbe49a0e
doc/encoders: improve libvo-aacenc doc
...
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-09-15 11:35:32 +02:00
Timothy Gu
0e11790cf7
doc/encoders: add doc for AAC encoder
...
Thanks-to: Kostya Shishkov <kostya.shishkov@gmail.com>
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-09-15 11:35:17 +02:00
Michael Niedermayer
c45e9097d8
Merge commit 'ec17d1aa8b833d49d8fc479e44e9e22858aa486c'
...
* commit 'ec17d1aa8b833d49d8fc479e44e9e22858aa486c':
doc: Drop VDPAU from list of supported codecs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-11 12:42:11 +02:00
Timothy Gu
83165e39fe
doc: Rename avtools-common-opts to fftools-common opts
...
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-10 18:04:03 +02:00
Diego Biurrun
ec17d1aa8b
doc: Drop VDPAU from list of supported codecs
2013-09-10 12:38:41 +02:00
James Almer
e3d34100e7
doc: add *install-doc that covers all documentation
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-08 05:25:17 +02:00
James Almer
1e97ae4ba3
doc: rename *install-doc to *install-html
...
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-07 21:41:43 +02:00
James Almer
2df184f3d5
doc: fix install-doc dependencies
...
Put it inside its own ifdef conditional.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-07 21:41:43 +02:00
Paul B Mahol
898c6191ff
lavfi: Weston 3 Field Deinterlacing Filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-06 12:46:56 +00:00
Paul B Mahol
d2e237338d
lavfi/mp: remove mp=fil
...
The filter does not work correctly most of time.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-05 20:22:47 +00:00
Paul B Mahol
0a8bb91505
lavfi/mp: remove mp=dint
...
There are better and actually maintained filters that have similar
functionality.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-05 20:03:36 +00:00
Clément Bœsch
f974289671
doc/APIchanges: update hashes and dates after last two commits.
...
Sorry, I'm too lazy to fix the rest.
2013-09-04 22:18:59 +02:00
Clément Bœsch
3e1f507f3e
avcodec: make avcodec_close() more tolerant.
...
See previous commit.
2013-09-04 22:06:38 +02:00
Clément Bœsch
36cd017acd
avformat: make avformat_close_input() more tolerant.
...
The purpose of this commit is to make error management simpler and less
error prone, just like av_free() which is safe with NULL.
2013-09-04 22:06:38 +02:00
Clément Bœsch
dc8f732292
doc/examples: fix lib math dep for resampling_audio.
...
It uses at least sin()
2013-09-04 15:49:18 +02:00
Clément Bœsch
98b9bbb787
doc/examples: remove extra "the".
...
"into the doc/examples directory" vs "into doc/examples".
2013-09-04 15:46:31 +02:00
Michael Niedermayer
35307df53c
Merge commit '0ebfdae099d2749240b6a565abcdf0bf62589748'
...
* commit '0ebfdae099d2749240b6a565abcdf0bf62589748':
doc: Describe TB option of setpts filter
Conflicts:
doc/filters.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-04 14:06:46 +02:00
Clifford Wolf
0ebfdae099
doc: Describe TB option of setpts filter
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-09-04 12:28:28 +02:00
Clément Bœsch
30d40c9e86
lavfi/drawtext: add generic timeline interface and deprecate "draw".
2013-09-03 21:12:15 +02:00
Paul B Mahol
916549cb1e
lavfi/mp: remove mp=phase
...
The filter was ported to a native libavfilter filter.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-03 14:05:38 +00:00
Paul B Mahol
3dd4b6ea41
lavfi: port phase filter from libmpcodecs
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-03 14:05:38 +00:00
Michael Niedermayer
4cfe3b7405
Merge commit '7df9e693a34c84c698da60426c78140c950f95ed'
...
* commit '7df9e693a34c84c698da60426c78140c950f95ed':
cosmetics: Fix ATRAC codec name spelling
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-03 15:05:18 +02:00
Diego Biurrun
7df9e693a3
cosmetics: Fix ATRAC codec name spelling
2013-09-02 21:38:57 +02:00
Marton Balint
b339dccbba
lavc: add teletext decoder using libzvbi
...
Based on a patch by Wolfram Gloger <wmglo@dent.med.uni-muenchen.de>.
http://lists.ffmpeg.org/pipermail/ffmpeg-devel/2012-December/136677.html
The original patch was rebased by Tudor SUCIU <tudor.suciu@gmail.com>.
Lots of additional features and fixes are made by me.
Fixes ticket #2086 .
Changes since last version:
- change default page to all pages
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-02 01:19:52 +02:00
Michael Niedermayer
91acb23a28
doc: fix insane hard texi2html dependancy
...
Found-by: nevcairiel
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-01 20:02:52 +02:00
Michael Niedermayer
d8809b357c
Merge commit 'f4ca970dba13a60a1334cce1b574036e6f624b9c'
...
* commit 'f4ca970dba13a60a1334cce1b574036e6f624b9c':
configure: Add docdir configuration option
Conflicts:
configure
doc/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-01 13:42:37 +02:00
Stefano Sabatini
291ad12ea2
ffprobe: show probe_score in the format section
...
Should address trac ticket #2621 .
2013-09-01 11:34:18 +02:00
Stefano Sabatini
51b01573e5
ffprobe: fix format section XML validation
...
It was broken since 2186a7e547
.
2013-09-01 11:34:12 +02:00
Vittorio Giovara
f4ca970dba
configure: Add docdir configuration option
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-08-31 16:16:38 +02:00
Thilo Borgmann
d814a839ac
Reinstate proper FFmpeg license for all files.
2013-08-30 15:47:38 +00:00
Timothy Gu
e45e72f5f8
doc/encoders: reformat and add some clarification in libtwolame doc
...
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-08-30 11:37:07 +02:00
Timothy Gu
40b8350b57
doc/encoders: reformat libmp3lame doc
...
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-08-30 11:36:35 +02:00
Michael Niedermayer
ec120efaa9
doc/snow: add gray/alpha/gbr
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-29 22:52:04 +02:00
Stefano Sabatini
7528fdcda3
doc/APIchanges: add missing entry for av_format_probe_score() function addition
2013-08-29 00:10:34 +02:00
Stefano Sabatini
083f058024
doc/formats: remove probe_score entry, since it's not an option
2013-08-29 00:08:27 +02:00
Michael Niedermayer
e31db621bf
avformat: export probe score
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-28 22:18:57 +02:00
Michael Niedermayer
48480da6ad
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
doc: document the asf demuxer
Conflicts:
doc/demuxers.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-28 13:03:09 +02:00
Michael Niedermayer
a13af77f49
Merge commit '21015109ec0fac0f104a5355f272ecb956ba3f4e'
...
* commit '21015109ec0fac0f104a5355f272ecb956ba3f4e':
doc: Document the flv demuxer
Conflicts:
doc/demuxers.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-28 11:55:03 +02:00
Luca Barbato
48f2e53ad0
doc: document the asf demuxer
...
And drop a typo from the previous FLV entry.
2013-08-28 11:02:56 +02:00
Luca Barbato
21015109ec
doc: Document the flv demuxer
2013-08-27 14:38:19 +02:00
Paul B Mahol
b1e276f8df
lavfi/hue: allow changing brightness
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-08-22 14:56:13 +00:00
Stefano Sabatini
7af7b45c38
lavf/image2: extend start_number range to accept zero
...
Address trac ticket #2884 .
2013-08-22 14:26:23 +02:00
Michael Niedermayer
d68adbd666
Merge commit 'f8ef91ff3d6bb83d601d816ef9368f911021c64b'
...
* commit 'f8ef91ff3d6bb83d601d816ef9368f911021c64b':
movenc: add faststart option for web streaming
Conflicts:
doc/muxers.texi
libavformat/movenc.c
libavformat/movenc.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-22 13:37:16 +02:00
Stefano Sabatini
71c5f9d29c
doc/muxers: add elaborated example for the tee muxer
...
The example shows how to combine bsfs and select options.
2013-08-21 17:44:35 +02:00
Stefano Sabatini
5ae3563359
lavf/tee: add special select option
2013-08-21 17:44:35 +02:00
Clément Bœsch
f8ef91ff3d
movenc: add faststart option for web streaming
...
Faststart moves the moov atom to the beginning of the file and rewrites
the rest of the file after muxing is complete.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-08-21 14:20:33 +01:00
Michael Niedermayer
ca7f637a1e
doc/filters: move fps filter start_time item to correct place
...
Fixes warnings
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-21 14:29:15 +02:00
Michael Niedermayer
b69b075ac6
Merge commit '545a0b807cf45b2bbc4c9087a297b741ce00f508'
...
* commit '545a0b807cf45b2bbc4c9087a297b741ce00f508':
vf_fps: add 'start_time' option
Conflicts:
doc/filters.texi
libavfilter/vf_fps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-21 11:37:10 +02:00
Justin Ruggles
545a0b807c
vf_fps: add 'start_time' option
...
This allows for dropping or duplication to match a particular start time.
2013-08-20 14:10:02 -04:00
Stephen Hutchinson
76d8d23881
Revert "doc/RELEASE_NOTES: add a note about AVISynth"
...
This reverts commit 3aa2257d24
.
2013-08-19 12:39:28 +02:00
Stefano Sabatini
faf7c35655
lavf/tee: add support for bitstream filtering
...
This allows to apply different bitstream filters to different outputs,
with no need to transcode.
2013-08-16 17:58:58 +02:00
Paul B Mahol
ef6718a5f7
lavfi/tile: make color of blank/unused area configurable
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-08-16 12:40:01 +00:00
Michael Niedermayer
6d246f440e
avfilter/vf_scale: generic swscale option support
...
With this all AVOptions from swscale can be set without each needing
changes to vf_scale.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-15 23:23:58 +02:00
Michael Niedermayer
1e0e193240
sws: add dither enum
...
This allows specifying more dither algorithms without using up flags and
without ambiguities.
Also initialize the new field based on the flags and use it.
Note, improving the logic of the checks is left to subsequent
commits, this here only switches from flags to enum.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-15 21:39:32 +02:00
Paul B Mahol
93f4277714
WavPack encoder
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-08-14 14:04:05 +00:00
Timothy Gu
bbbd9596ad
doc/filters: reformat scale filter doc
...
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-08-13 23:51:08 +02:00
Michael Niedermayer
a8163a786b
doc/filters.texi: Fix duplicate words
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-12 19:40:29 +02:00
Michael Niedermayer
e1c44be802
doc/filter_design.txt: Fix duplicate words
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-12 19:40:29 +02:00
Thilo Borgmann
f18ccb529f
Fix wrong use of "an" in some comments.
2013-08-12 03:27:26 +02:00
Reimar Döffinger
d404fe35b2
Make new VDPAU easier to use by adding context to callback.
...
Using VDPAU correctly means checking for preemption
and possibly regenerating the context all the time.
With the current API there is no context or other
user-defined pointer and thus this in not possible
during decoding unless using some hack like global
variables.
The need to reinitialize both surfaces and even function
pointers makes handling preemption even more difficult.
This patch introduces a new render2 function that gets
both the AVCodecContext and AVFrame in addition,
in both the user can store additional opaque data.
This allows even advanced approaches like keeping a
"generation counter" for the surfaces so they can be
regenerated on the fly and efficiently.
In addition, the function has a return value that will
be passed through all the way instead of being silently
ignored as for the current render function.
Unfortunately the HWAccel API has no way of providing
API/ABI compatibility, so a currently disallowed
state (render pointer being NULL) is used to extend it.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-08-11 20:16:57 +02:00
Reimar Döffinger
af05edc658
vdpau: Add an allocation function for AVVDPAUContext.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-08-11 19:31:46 +02:00
Michael Niedermayer
99091ff217
Merge commit '205a4502d3da9de2db75d2c965c9d065574e9266'
...
* commit '205a4502d3da9de2db75d2c965c9d065574e9266':
doc: Clarify the avconv section about -re
Conflicts:
doc/ffmpeg.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-11 11:49:47 +02:00
Michael Niedermayer
5993b96269
Merge commit 'd175a5730b42166704b7262b33f4b780d9d92f60'
...
* commit 'd175a5730b42166704b7262b33f4b780d9d92f60':
doc: Add an example on publishing over RTMP
doc: Add librtmp to the section header for the librtmp specific details
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-11 11:37:57 +02:00
Michael Niedermayer
159dfd2625
Merge commit 'a435ca5b4d9efebf0759220681010977c36615f7'
...
* commit 'a435ca5b4d9efebf0759220681010977c36615f7':
doc: Explain that the default RTMP user agent is different when publishing
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-11 11:28:54 +02:00
Michael Niedermayer
78242e4310
Merge commit 'aa16a6b0c56e3f46c5d7efb706b87a8f7a1603ec'
...
* commit 'aa16a6b0c56e3f46c5d7efb706b87a8f7a1603ec':
doc: Extend the rtmp example to include how to pass username/password
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-11 11:24:14 +02:00
Michael Niedermayer
67a580f423
Merge commit '5a9a9d4a2abefa63d9a898ce26715453c569e89d'
...
* commit '5a9a9d4a2abefa63d9a898ce26715453c569e89d':
lavc: Add refcounted api to AVPacket
Conflicts:
libavcodec/avpacket.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-11 10:45:13 +02:00
Martin Storsjö
205a4502d3
doc: Clarify the avconv section about -re
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-08-10 18:37:21 +03:00
Martin Storsjö
d175a5730b
doc: Add an example on publishing over RTMP
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-08-10 18:37:21 +03:00
Martin Storsjö
a435ca5b4d
doc: Explain that the default RTMP user agent is different when publishing
...
The fact that a different user agent is used is cruicial for getting
publishing authentication working. (When using librtmp, this other
user agent has to be specified manually, but that's not needed
with the libavformat internal RTMP support.)
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-08-10 18:37:21 +03:00
Martin Storsjö
aa16a6b0c5
doc: Extend the rtmp example to include how to pass username/password
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-08-10 18:37:21 +03:00
Martin Storsjö
3bea53dbdf
doc: Add librtmp to the section header for the librtmp specific details
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-08-10 18:37:21 +03:00
Luca Barbato
5a9a9d4a2a
lavc: Add refcounted api to AVPacket
...
Provide a clean way to manipulate packets.
2013-08-10 13:41:35 +02:00
Mark Harris
69f543854d
doc/filters: fix sine sample_rate abbreviation
...
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-08-10 10:11:09 +02:00
Bryce W. Harrington
d9c46c3cd9
doc: apply various grammar fixes
...
The first sentence of each of the modified man pages are worded a bit
awkwardly. These minor copy-edits should make them clearer.
Signed-off-by: Bryce Harrington <b.harrington@samsung.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-08-10 10:07:30 +02:00
Michael Niedermayer
69ea65b46f
Merge commit '3e5898782dce60334ab294821ca00b19c648cf66'
...
* commit '3e5898782dce60334ab294821ca00b19c648cf66':
Voxware MetaSound decoder
Conflicts:
Changelog
libavcodec/Makefile
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-08 12:11:33 +02:00
Kostya Shishkov
3e5898782d
Voxware MetaSound decoder
2013-08-08 10:52:44 +02:00
Michael Niedermayer
8d06ce7941
Merge commit '605387582bd35920b83a26dabbe1c0601f425621'
...
* commit '605387582bd35920b83a26dabbe1c0601f425621':
lavf: Support unix sockets
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-06 15:33:12 +02:00
Michael Niedermayer
560e9365b6
Merge commit 'bc54c2ae3ca6abd225dc331eafc12108513158de'
...
* commit 'bc54c2ae3ca6abd225dc331eafc12108513158de':
libx264: add shortcut for the bluray compatibility option
Conflicts:
doc/encoders.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-06 15:26:04 +02:00
Michael Niedermayer
9547e3eef3
Merge commit 'f824535a4a79c260b59d3178b8d958217caffd78'
...
* commit 'f824535a4a79c260b59d3178b8d958217caffd78':
vdpau: deprecate bitstream buffers within the hardware context
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-06 14:30:49 +02:00
Michael Niedermayer
3b805dcaa9
Merge commit '549294fbbe1c00fee37dc4d3f291b98945e11094'
...
* commit '549294fbbe1c00fee37dc4d3f291b98945e11094':
vdpau: deprecate VDPAU codec capability
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-06 13:54:05 +02:00
Michael Niedermayer
4ee0984341
Merge commit 'a0ad5d011318f951ecd4c9ffe1829518c9533909'
...
* commit 'a0ad5d011318f951ecd4c9ffe1829518c9533909':
vdpau: deprecate old codec-specific pixel formats
Conflicts:
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-06 13:45:21 +02:00
Michael Niedermayer
7cbef2ed7e
Merge commit '811bd0784679dfcb4ed02043a37c92f9df10500e'
...
* commit '811bd0784679dfcb4ed02043a37c92f9df10500e':
avconv: make input -ss accurate when transcoding
Conflicts:
Changelog
doc/ffmpeg.texi
ffmpeg.h
ffmpeg_filter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-06 11:39:09 +02:00
Marton Balint
a7bb12a307
mpegts: add fix_teletext_pts mpegts demuxer option
...
Changes since v1 of the patch:
- enable option by default
- add documentation
- move up PTS override code after PES header parsing, to ensure we use the
last PCR before the first packet of the teletext PES packet.
The option overrides teletext packet PTS and DTS values with the timestamps
calculated from the PCR of the first program which the teletext stream is part
of and is not discarded.
Using the same teletext PID for multiple programs is possible, therefore we
need some kind of heuristics to know which program PCR we should synchronize
to. Using the first non-discarded PCR pid among the programs of the teletext
stream seemed like a good choice.
The patch does not do PCR interpolation to estimate the PCR of the teltetext
packet, it just uses the last PCR of the program, which may cause a slight
error (0.1 sec) in the teletext packet pts-es.
Based on a patch by Reimar Döffinger.
http://lists.ffmpeg.org/pipermail/ffmpeg-devel/2012-September/131610.html
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-06 02:47:38 +02:00
Luca Barbato
605387582b
lavf: Support unix sockets
2013-08-05 16:13:35 +02:00
Luca Barbato
bc54c2ae3c
libx264: add shortcut for the bluray compatibility option
...
As for intra-refresh it is just a commodity.
2013-08-05 16:13:35 +02:00
Rémi Denis-Courmont
f824535a4a
vdpau: deprecate bitstream buffers within the hardware context
...
The bitstream buffers are now private and freed by libavcodec. For
backward compatibility, the hold bitstream buffer pointer is left NULL
(applications were supposed to av_freep() it).
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-08-05 11:21:36 +02:00
Rémi Denis-Courmont
549294fbbe
vdpau: deprecate VDPAU codec capability
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-08-05 11:20:32 +02:00
Rémi Denis-Courmont
a0ad5d0113
vdpau: deprecate old codec-specific pixel formats
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-08-05 11:16:54 +02:00
Anton Khirnov
811bd07846
avconv: make input -ss accurate when transcoding
...
Insert (a)trim filters on the corresponding inputs, so the extra frames
are decoded and discarded.
2013-08-05 10:53:41 +02:00
Nedeljko Babic
18d7074b4e
libavcodec: Implementation of 32 bit fixed point FFT
...
Iterative implementation of 32 bit fixed point split-radix FFT.
Max FFT that can be calculated currently is 2^12.
Signed-off-by: Nedeljko Babic <nbabic@mips.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-04 14:01:41 +02:00
Andrey Utkin
27cc3e72f8
doc/muxers: Document use case of mpegts muxer option tables_version
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-04 13:35:54 +02:00
Timothy Gu
3415058541
vf_scale: add force_original_aspect_ratio
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-04 13:27:01 +02:00
Michael Niedermayer
f187390907
doc/examples/filtering_audio: make const arrays also static
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-03 22:22:03 +02:00
Andrey Utkin
5b76c3a120
doc/muxers: Document previously undocumented mpegts muxer options
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-03 20:30:33 +02:00
Michael Niedermayer
82fdfe8e51
Merge commit 'a8b19271c3b40ac3c3dc769fe248887acf14ba5a'
...
* commit 'a8b19271c3b40ac3c3dc769fe248887acf14ba5a':
avcodec: Add output_picture_number to AVCodecParserContext
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-03 10:48:11 +02:00
Michael Niedermayer
fa5410f61a
Merge commit '79be2c325c5ee8f7ac9e28399e51986ebe99bb3c'
...
* commit '79be2c325c5ee8f7ac9e28399e51986ebe99bb3c':
doc/print_options: Move options headers to a saner place
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-03 09:22:30 +02:00
Michael Niedermayer
a8e963835a
Merge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e'
...
* commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e':
Give less generic names to global library option arrays
Conflicts:
libavcodec/options_table.h
libavfilter/avfilter.c
libavformat/options_table.h
libswscale/options.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-03 09:16:36 +02:00
Yusuke Nakamura
a8b19271c3
avcodec: Add output_picture_number to AVCodecParserContext
...
Set output_picture_number in H.264 parser.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-08-02 20:59:45 +02:00
Diego Biurrun
79be2c325c
doc/print_options: Move options headers to a saner place
2013-08-02 19:19:02 +02:00
Diego Biurrun
b5a138652f
Give less generic names to global library option arrays
2013-08-02 19:19:02 +02:00
Andrey Utkin
11ace70607
doc/protocols: Document file protocol options
...
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-01 04:08:14 +02:00
Vittorio Giovara
7748dd41be
avconv: add -n option to immediately exit when output files already exist
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-31 22:28:54 +03:00
Andrey Utkin
681ad3a5b6
Document new 'blocksize' option of 'pipe' protocol
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-31 21:17:03 +02:00
Timothy Gu
3b3c1ed076
libxvid: Add SSIM displaying through a libxvidcore plugin
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-31 12:41:27 +02:00
Timothy Gu
ccb212b6c3
libxvid: add working lumimasking and variance AQ
...
The old implementation is unusable due to change in the Xvid API.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-31 11:57:52 +02:00
Timothy Gu
6b255e5e70
doc/encoders: add libxvid doc
...
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-07-30 16:24:29 +02:00
Michael Niedermayer
c7d1717957
Merge commit '0e8c6f221a8ddb7dfb3c9e9bd0b33cb12e9391b8'
...
* commit '0e8c6f221a8ddb7dfb3c9e9bd0b33cb12e9391b8':
avisynth: Fix a "AVISynth" vs. "AviSynth" struct name typo
Conflicts:
doc/general.texi
libavformat/avisynth.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-30 11:26:39 +02:00
Paul B Mahol
c96b3ae8db
doc/filters: fix typo
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-29 20:05:21 +00:00
Paul B Mahol
6b68e2a43b
lavfi: add compand filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-29 19:11:50 +00:00
Diego Biurrun
0e8c6f221a
avisynth: Fix a "AVISynth" vs. "AviSynth" struct name typo
...
Also fix some similar typos in comments and documentation.
2013-07-29 20:09:59 +02:00
Florent Tribouilloy
2186a7e547
ffprobe: add -show_programs option
...
The option is used to sort the streams by program.
Signed-off-by: Florent Tribouilloy <florent.tribouilloy@smartjog.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-07-28 16:39:06 +02:00
Stefano Sabatini
18df69d238
doc/ffprobe.xsd: specify tag elements in stream after disposition element
...
Fix XML schema validation, since elements must appear in the same order
as specified in the schema.
2013-07-28 16:38:49 +02:00
Michael Niedermayer
f0308af5fa
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
doc: cosmetics: Consistently format list and table items
Conflicts:
doc/developer.texi
doc/fate.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-28 14:21:11 +02:00
Stefano Sabatini
b4bd21b7fe
doc/codecs: fix dangling reference to codec-options chapter
2013-07-27 16:50:19 +02:00
Diego Biurrun
270d7e3a18
doc: cosmetics: Consistently format list and table items
2013-07-27 16:24:55 +02:00
Michael Niedermayer
46ad2d9e44
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
miscellaneous typo fixes
Conflicts:
configure
libavformat/avisynth.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-26 11:12:11 +02:00
Diego Biurrun
03039f4c8c
miscellaneous typo fixes
2013-07-25 19:43:32 +02:00
Timothy Gu
11cb697501
doc/encoders: partially rewrite and reformat libx264 docs
...
Format is based on the thread:
"[PATCH] doc/encoders: Add libopus encoder doc" (06-28-2013)
http://thread.gmane.org/gmane.comp.video.ffmpeg.devel/165368/
Also merge the two option sections (Mapping and Private options).
Patch partially edited by Stefano Sabatini.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-07-24 16:29:12 +02:00
Michael Niedermayer
abc8110f7e
avcodec: add avcodec_chroma_pos_to_enum()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-23 03:11:28 +02:00
Michael Niedermayer
5feaa451bb
doc: add "rematrix_maxval"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-22 03:37:55 +02:00
Michael Niedermayer
0c480bcfd9
doc/filters: document vf_scales color range
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-20 23:24:13 +02:00
Michael Niedermayer
bbf6cb754c
avfilter/vf_scale: Add in/out yuv color matrix option
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-20 22:11:50 +02:00
Lukasz Marek
a289f418e4
doc/filters: add sepia example for colorchannelmixer
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-19 19:36:37 +00:00
wm4
72f5a6d067
examples: demuxing: print ffplay command even if sample format is planar
...
Adjust the code so that a working ffplay command is printed in the
planar audio case.
2013-07-19 12:14:54 +02:00
wm4
9f31c1608c
examples: demuxing: simplify audio output
...
There is no reason why this should copy the audio data in a very
complicated way. Also, strictly write the first plane, instead of
writing the whole buffer. This is more helpful in context of the
example. This way a user can clearly confirm that it works by playing
the written data as raw audio.
2013-07-19 12:14:46 +02:00
wm4
06b269dacb
examples: demuxing: do partial audio packet decoding
...
This assumes one audio packet is decoded one time. This is not true:
packets can be partially decoded. Then you have to "adjust" the packet
and pass the undecoded part of the packet to the decode function again.
2013-07-19 12:14:23 +02:00
Stefano Sabatini
9836f47cf8
doc/filters: update/correct mp documentation
2013-07-17 09:34:05 +02:00
Stefano Sabatini
34322ab27a
doc/bitstream_filters: document dump_extra
2013-07-17 09:31:02 +02:00
Paul B Mahol
ed448efe61
lavfi/mp: remove mp=perspective
...
The filter was ported to a native libavfilter filter.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-14 16:27:18 +00:00
Paul B Mahol
80c6445932
lavfi: port perspective filter from libmpcodecs
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-14 16:27:17 +00:00
Stefano Sabatini
ab5f581625
doc/bitstream_filters: amend name of some bitstream filters
2013-07-14 16:06:36 +02:00
Jean Delvare
9e4bb09140
lavfi/delogo: Document where parameter show=1 draws its rectangle
...
It is not completely obvious where delogo's parameter show=1 draws its
rectangle. Document it so that the user can more easily tune the
parameters.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-13 17:05:39 +02:00
Paul B Mahol
b3405b1bda
lavfi/trim: use AV_OPT_TYPE_DURATION
...
Workarounds for rounding differences between platforms should not be
needed any more.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-12 15:58:22 +00:00
Stefano Sabatini
19ea08a11a
lavf/segment: add initial_offset option
...
Should address trac ticket #2224 .
2013-07-11 00:36:24 +02:00
Stefano Sabatini
b3ac8a2a60
doc/formats: add section describing stream specifiers
2013-07-11 00:35:35 +02:00
Stefano Sabatini
e7a6962e76
doc/developer: update sections about external development
...
Replace the sections "API" and "Integrating libavcodec or libavformat"
with updated / more accurate text.
See thread:
Subject: [FFmpeg-devel] [PATCH] doc/developer: merge and update sections about external development
Date: Fri, 5 Jul 2013 11:07:07 +0200
2013-07-11 00:01:19 +02:00
Paul B Mahol
884c890535
lavfi: add aecho filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-10 12:10:58 +00:00
Michael Niedermayer
a37e42b3ee
Update back for git master
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-10 03:14:23 +02:00
Michael Niedermayer
1ebb95d5f1
Update for 2.0
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-10 02:15:43 +02:00
Michael Niedermayer
3aa2257d24
doc/RELEASE_NOTES: add a note about AVISynth
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-10 00:24:04 +02:00
Michael Niedermayer
e9be4675b8
doc/ffmpeg: document -override_ffserver
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09 22:19:10 +02:00
Paul B Mahol
c5a1b18f18
lavfi/drawtext: add support for printing frame metadata
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-09 15:21:01 +00:00
Paul B Mahol
3c5071db88
lavfi/psnr: rename 's' parameter to match documentation
...
Also removes some irrelevant lines in documentation.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-09 09:40:53 +00:00
Paul B Mahol
6150bec3f8
lavfi: add psnr filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-08 14:58:04 +00:00
Paul B Mahol
9635806265
lavfi/blend: use dual input helpers
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-06 04:58:34 +00:00
Stefano Sabatini
2aa2b4ac65
examples/muxing: add support to audio resampling
...
Allows to encode to output in case the destination sample format is
different from AV_SAMPLE_FMT_S16.
2013-07-06 12:31:16 +02:00
Timothy Gu
561e05136f
doc/encoders: add libopus encoder doc
...
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-07-06 12:27:45 +02:00
Jean Delvare
72abce3c46
lavfi/delogo: option show shouldn't affect band
...
Options "show" and "band" are unrelated and should thus be
independent. However, setting "show" to 1 currently resets "band" to
its default value of 4. While this is documented, this still
surprising and confusing IMHO.
Change this behavior and make "show" and "band" independent from each
other. Update the documentation accordingly.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-05 18:02:11 +02:00
Stefano Sabatini
d880b2bdff
doc/filters: clarify documentation for overlay repeatlast option
...
Suggested-By: Oliver Fromme <oliver@fromme.com>
2013-07-05 12:35:12 +02:00
Stefano Sabatini
d06ae0d791
lavf: fix documentation for avoid_negative_ts
...
Prefer "non-negative" over "positive", the former is more accurate.
2013-07-05 00:58:03 +02:00
Stefano Sabatini
838bd73139
lavfi: create Libav-API compatibility layer for avfilter_graph_parse() at the next bump
...
Add function avfilter_graph_parse_ptr() and favor it in place of
avfilter_graph_parse(), which will be restored with the old/Libav
signature at the next bump.
If HAVE_INCOMPATIBLE_LIBAV_API is enabled it will use the
Libav-compatible signature for avfilter_graph_parse().
At the next major bump the current implementation of
avfilter_graph_parse() should be dropped in favor of the Libav/old
implementation.
Should address trac ticket #2672 .
2013-07-03 13:21:42 +02:00
Michael Niedermayer
ffed7227c3
Revert "doc: add script to compute texi files dependencies"
...
This reverts commit 628ceac652
.
The commit broke out of tree builds
2013-07-03 12:59:59 +02:00
Stefano Sabatini
759dfd5684
examples/muxing: make more compact audio/video_time computation
2013-07-03 11:31:34 +02:00
Timothy Gu
4ec46b1160
doc/muxers: Add AIFF doc
...
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-07-03 11:25:45 +02:00
Stefano Sabatini
628ceac652
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.
2013-07-03 11:25:45 +02:00
wm4
c3316ddb83
lavf: add support for libgme
...
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-02 18:52:45 +02:00
wm4
a92fbe16f2
lavf/http: add support for reading streamcast metadata
...
Allow applications to request reading streamcast metadata. This uses
AVOptions as API, and requires the application to explicitly request
and read metadata. Metadata can be updated mid-stream; if an
application is interested in that, it has to poll for the data by
reading the "icy_metadata_packet" option in regular intervals.
There doesn't seem to be a nice way to transfer the metadata in a nicer
way. Converting the metadata to ID3v2 tags might be a nice idea, but
the libavformat mp3 demuxer doesn't seem to read these tags mid-stream,
and even then we couldn't guarantee that tags are not inserted in the
middle of mp3 packet data.
This commit provides the minimum to enable applications to retrieve
this information at all.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-07-02 02:00:56 +02:00
Stefano Sabatini
7ebab4159a
doc/encoders: apply various fixes to libmp3lame documentation
2013-07-01 16:00:37 +02:00
Michael Niedermayer
7f866c14ba
update all trac links to use the trac subdomain
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-29 19:27:49 +02:00
Stefano Sabatini
d47168e729
doc/muxers: apply various minor fixes to segment documentation
2013-06-29 14:12:11 +02:00
Stefano Sabatini
f150db096d
doc/muxers: sort muxers by name
2013-06-29 14:12:11 +02:00
Timothy Gu
a9bbf59be7
cosmetics: Fix "dont" "wont" "doesnt" typos
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-29 02:31:16 +02:00
Timothy Gu
7eb5288f17
doc/decoders: document libopus decoder
...
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-06-28 13:09:10 +02:00
Timothy Gu
934df3b037
doc/encoders: alphabetically list the encoders
...
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-06-28 13:07:15 +02:00
Stefano Sabatini
80b56a7bdd
examples/muxing: rename audio/video_pts to audio/video_time
...
The new name is less confusing, since the variables represent times
rather than timestamps.
2013-06-26 23:38:42 +02:00
Stefano Sabatini
db7ebab5c3
doc/bitstream_filters: document the chomp filter
...
TODO: add some meaningful examples.
2013-06-26 23:22:48 +02:00
Stefano Sabatini
7b38c4c95f
doc/bitstream-filters.texi: add documentation for the aac_adtstoasc filter
...
Based on the notes in libavcodec/aac_adtstoasc_bsf.c.
2013-06-26 23:22:39 +02:00
Stefano Sabatini
c58d535b2f
examples/Makefile: disable -O2 optimizations
...
There is no much point in optimizing example code, and the -O2 flag is
annoying when debugging.
2013-06-26 23:21:39 +02:00
Stefano Sabatini
3aa57e1582
examples/muxing: remove useless instruction
...
Simpler and less confusing.
2013-06-26 23:21:06 +02:00
Jean Delvare
ff995e2b6f
doc/filters: Fix texi syntax
...
Commit f1efaf8371
used parentheses
instead of curly braces in texi syntax, resulting in warnings when
the documentation is generated. Fix that.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-26 21:23:20 +02:00
Michael Niedermayer
f1efaf8371
Merge branch 'drawbox_exprs' of https://github.com/mjmvisser/FFmpeg
...
* 'drawbox_exprs' of https://github.com/mjmvisser/FFmpeg :
enabled expressions on x, y, w, h and t parameters for drawgrid and drawbox, added examples
Reviewed-by: Andrey Utkin
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-26 00:33:41 +02:00
Stefano Sabatini
4b6cf1ce0e
examples/muxing: vertically align
2013-06-25 21:36:53 +02:00
Mark Visser
84f571e37f
enabled expressions on x, y, w, h and t parameters for drawgrid and drawbox, added examples
2013-06-25 11:38:59 -04:00
Michael Niedermayer
bad8f04b04
Merge commit 'b0ce601c160c87349d093d7e542b5c752754f598'
...
* commit 'b0ce601c160c87349d093d7e542b5c752754f598':
doc/platform: Add info about ICL
Conflicts:
doc/platform.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-25 10:46:52 +02:00
Matthew Heaney
bc35df29c1
lavf: add AV_DISPOSITION flags for WebVTT text track kinds
...
There are 4 separate WebVTT text track kinds: subtitles (the default
if not otherwise specified), captions, descriptions, and metadata.
The WebM muxer needs to know which WebVTT text track kind this is, in
order to synthesize the correct track type and codec id.
To allow a demuxer to indicate the text track kind of the input, a new
set of AV_DISPOSITION flag values has been added, corresponding to
each of the non-default text track kind values.
2013-06-25 00:13:47 +02:00
Derek Buitenhuis
b0ce601c16
doc/platform: Add info about ICL
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-06-24 13:06:01 -04:00
Michael Niedermayer
af5f9c0876
Merge commit '95d52464542f532061290192518d5fe1c1930e8d'
...
* commit '95d52464542f532061290192518d5fe1c1930e8d':
lavc: Add option to encode MPEG-2 AAC with libfdk-aac
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-24 10:57:04 +02:00
Kieran Kunhya
95d5246454
lavc: Add option to encode MPEG-2 AAC with libfdk-aac
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-06-24 08:03:26 +02:00
Stefano Sabatini
7cc4115dd6
doc/decoders,decoders: add various missing final dots
...
Enhance consistency.
2013-06-21 18:25:49 +02:00
Timothy Gu
83647ace73
doc/decoders: Add libopencore-amrwb decoder doc
...
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-06-21 18:19:37 +02:00