virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Code Issues Releases Activity
60,528 Commits 37 Branches 400 Tags 460 MiB
8f92edf6f8
Commit Graph

4514 Commits

Author SHA1 Message Date
Stefano Sabatini
80193a12e0 doc/ffserver: use @command{} for specifying ffserver 2013-11-28 17:03:09 +01:00
Stefano Sabatini
39192b76f8 doc/ffserver: remove more pointless/outdated entries 
Mentioning build options, or bugs, or mysterious limitations should not
be done in the manual.
 2013-11-28 17:03:08 +01:00
Clément Bœsch
01c9d8094a doc/Makefile: cosmetics after previous commits. 2013-11-28 14:10:34 +01:00
Clément Bœsch
0d2c832445 doc/examples: update README. 2013-11-28 14:08:06 +01:00
Clément Bœsch
1d751768f3 build: also clean the examples with debug symbols 2013-11-28 14:06:57 +01:00
Clément Bœsch
fe318e143b build: split examples cleaning out of docclean. 2013-11-28 13:56:08 +01:00
Clément Bœsch
1a88e84fd5 build: integrate remaining examples. 2013-11-28 13:55:34 +01:00
Clément Bœsch
a8ac2a1530 doc/examples: make fill_samples static. 
This is required to build with FFmpeg compilation options.
 2013-11-28 13:54:44 +01:00
Clément Bœsch
e5102feb6b doc/examples: add transcode_aac to local Makefile. 2013-11-28 13:19:50 +01:00
Timothy Gu
a212d66c2a doc/default.css: sync with ffmpeg-web 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-11-28 10:27:25 +01:00
Stefano Sabatini
15f2cac018 doc/ffserver: remove outdated troubleshoot entry about audio 2013-11-28 10:19:12 +01:00
Stefano Sabatini
c4a03ac3b8 doc/ffserver: document configuration syntax 
While still incomplete, this is better than nothing at all.
 2013-11-28 10:18:55 +01:00
Stefano Sabatini
6b58488f92 doc/ffmpeg: use @command{} for programs mentioned in -override_ffserver 2013-11-27 15:48:19 +01:00
Derek Buitenhuis
ec0b0c2b58 doc/platform: Update to reflect current MSVC build situation 
Also update the C99 converter URL, since it uses GitHub Releases
to host the binaries now.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-11-27 13:39:42 +00:00
Derek Buitenhuis
fa515c2088 doc/platform: Update to reflect current MSVC build situation 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-11-27 13:39:03 +00:00
Michael Niedermayer
ba728c1a25 doc/examples/transcode_aac: remove non converted codepath 
This codepath is not implemented and just crashes, also its simpler
without special cases, which makes sense for an example

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-27 11:22:19 +01:00
Michael Niedermayer
7497c894cd doc/examples/transcode_aac: switch to swresample 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-27 11:15:48 +01:00
Michael Niedermayer
02abc905cd doc/examples/transcode_aac: fix project name 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-27 10:52:05 +01:00
Michael Niedermayer
715f3623f8 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Add an audio transcoding example.

Conflicts:
	configure
	doc/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-27 10:31:08 +01:00
Lukasz Marek
3aaa50a997 lavd/pulse_audio_enc: add buffer size control options 
Add options to control the size of the PulseAudio buffer.

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

Conflicts:
	Makefile

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

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

Conflicts:
	doc/APIchanges
	libavutil/version.h

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

Conflicts:
	Changelog
	doc/general.texi

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

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

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

Conflicts:
	Makefile
	doc/Makefile

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

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

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

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

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

Conflicts:
	configure
	doc/Makefile

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

Conflicts:
	Changelog
	Makefile
	configure
	ffmpeg.h

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

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

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

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

Conflicts:
	doc/filters.texi

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

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-18 01:46:32 +00:00
Michael Niedermayer
74a8fe9483 doc/ffmpeg: document qscale and video stream special case 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-17 16:08:06 +01:00
Michael Niedermayer
0ee905e243 Merge commit '5b9c3b4505206143d85398c1410949319fa1180f' 
* commit '5b9c3b4505206143d85398c1410949319fa1180f':
  Replace all instances of avcodec_alloc_frame() with av_frame_alloc().

Conflicts:
	doc/examples/decoding_encoding.c
	doc/examples/muxing.c
	ffmpeg.c
	libavcodec/alacenc.c
	libavcodec/libopenjpegenc.c
	libavcodec/libvpxenc.c
	libavcodec/pcm.c
	libavcodec/xbmenc.c
	libavcodec/xwdenc.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-16 23:54:10 +01:00
Ronald S. Bultje
72ca830f51 lavc: VP9 decoder 
Originally written by Ronald S. Bultje <rsbultje@gmail.com> and
Clément Bœsch <u@pkh.me>

Further contributions by:
Anton Khirnov <anton@khirnov.net>
Diego Biurrun <diego@biurrun.de>
Luca Barbato <lu_zero@gentoo.org>
Martin Storsjö <martin@martin.st>

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-11-15 10:16:28 +01:00
Michael Niedermayer
7c888ae746 Merge commit 'cce3e0a49f0dd030262c28d9c53de0bd2fd909c4' 
* commit 'cce3e0a49f0dd030262c28d9c53de0bd2fd909c4':
  Move av_fast_{m,re}alloc from lavc to lavu.

Conflicts:
	libavcodec/avcodec.h
	libavcodec/utils.c
	libavutil/mem.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-14 15:04:04 +01:00
Michael Niedermayer
b71e4d8717 Merge commit '8941971a8f2e24b9a84fe29f128d13ceb89c0a65' 
* commit '8941971a8f2e24b9a84fe29f128d13ceb89c0a65':
  lavc: make error_rate a private option of mpegvideo encoders

Conflicts:
	libavcodec/options_table.h
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-14 13:14:41 +01:00
Michael Niedermayer
31c09b7663 Merge commit '728c4658563dc82115ade0f1679679eddb7be5ff' 
* commit '728c4658563dc82115ade0f1679679eddb7be5ff':
  vdpau: add a constructor for AVVDPAUContext.

Conflicts:
	libavcodec/vdpau.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-14 13:08:36 +01:00
Michael Niedermayer
5f231d909f Merge commit 'ca22d1dea2842fca0422dd1d2bd09e7eb2c8f118' 
* commit 'ca22d1dea2842fca0422dd1d2bd09e7eb2c8f118':
  vdpau: add a convenience function for getting a decoder profile.

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-14 13:00:10 +01:00
Timothy Gu
62923e9014 doc: remove avutil.txt 
No useful contents. Also hard to keep up-to-date.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-11-14 09:51:10 +01:00
Timothy Gu
52955c412c doc/libavutil: add things from avutil.txt 
Many minor fixes from: Stefano Sabatini <stefasab@gmail.com>.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-11-14 09:51:10 +01:00
Anton Khirnov
cce3e0a49f Move av_fast_{m,re}alloc from lavc to lavu. 2013-11-14 09:42:22 +01:00
Anton Khirnov
8941971a8f lavc: make error_rate a private option of mpegvideo encoders 2013-11-14 09:39:43 +01:00
Anton Khirnov
728c465856 vdpau: add a constructor for AVVDPAUContext. 
We will likely want to add new fields to it in the future, so this is
needed to avoid breaking ABI.
 2013-11-14 09:38:58 +01:00
Anton Khirnov
ca22d1dea2 vdpau: add a convenience function for getting a decoder profile. 
Based on the code by Rémi Denis-Courmont <remi@remlab.net> from VLC.
 2013-11-14 09:38:50 +01:00
Michael Niedermayer
5231eecdaf Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Deprecate obsolete XvMC hardware decoding support

Conflicts:
	libavcodec/mpeg12.c
	libavcodec/mpeg12dec.c
	libavcodec/mpegvideo.c
	libavcodec/options_table.h
	libavutil/pixdesc.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-14 03:26:35 +01:00
Diego Biurrun
19e30a58fc Deprecate obsolete XvMC hardware decoding support 
XvMC has long ago been superseded by newer acceleration APIs, such as
VDPAU, and few downstreams still support it. Furthermore XvMC is not
implemented within the hwaccel framework, but requires its own specific
code in the MPEG-1/2 decoder, which is a maintenance burden.
 2013-11-13 21:07:45 +01:00
Timothy Gu
1062a7f404 doc: remove soc.txt 
The file was written in 2006, it was never updated nor really used as
reference for SOC-like programs.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-11-13 14:28:19 +01:00
Stefano Sabatini
8cd3685a3f lavfi: add elbg filter 2013-11-13 11:21:57 +01:00
Lou Logan
6d90a5c149 Fix example in pullup documentation. 
The pullup filter does not work well with the fps filter, it
currently needs -r

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
 2013-11-12 14:22:15 +01:00
Timothy Gu
a7f35afb56 doc: delete viterbi.txt 
The description has been moved to the FFmpeg wiki:
https://trac.ffmpeg.org/wiki/ViterbiAlgorithm

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-11-11 10:45:19 +01:00
Clément Bœsch
3e1097b909 avfilter/fade: add color option. 
Fixes Ticket #1822.
 2013-11-10 19:05:08 +01:00
Timothy Gu
bc27309591 doc/encoders: fix libfdk-aac "Examples" subsection 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-11-10 12:36:54 +01:00
Timothy Gu
3853fcd5a9 doc/doxy-wrapper: disable inserting headers and footers 
The headers and footers are used to integrate Doxygen into Libav's website.
Fixes the Libav-ish look when doing `make apidoc`.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-10 02:33:33 +01:00
Clément Bœsch
3e036d407d doc/muxers: document animated GIF muxer. 2013-11-07 20:30:43 +01:00
Michael Niedermayer
be41f21a3d Merge commit 'cd8f772d0678a90957f4dfd5ce51af9d22e3f212' 
* commit 'cd8f772d0678a90957f4dfd5ce51af9d22e3f212':
  lavc: Add colorimetry values for BT.2020, other non-included ones

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-04 21:26:34 +01:00
Jan Ekström
cd8f772d06 lavc: Add colorimetry values for BT.2020, other non-included ones 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2013-11-04 15:39:33 +01:00
Michael Niedermayer
85cabf1ca9 avutil: add av_fopen_utf8() 
fopen() on windows uses UTF-16, we use UTF-8 everywhere, this
function bridges the gap by using avpriv_open()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-04 15:38:52 +01:00
Michael Niedermayer
d0ac60730d avfilter/vf_scale: add ov/hsub 
Suggested-by: divVerent
Reviewed-by: Stefano
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-04 15:23:26 +01:00
Clément Bœsch
fb10b43fc4 doc/examples: rename demuxing to demuxing_decoding. 
That example shows how the decoding process works, not only the
demuxing.
 2013-11-04 12:53:06 +01:00
Clément Bœsch
d10b1a200d doc/examples/demuxing: show how to use the reference counting system. 2013-11-04 12:53:06 +01:00
Michael Niedermayer
a75bf4e5c1 Merge commit '34a0ac41a880039c7fb4b3abce10d8e2ce48fac7' 
* commit '34a0ac41a880039c7fb4b3abce10d8e2ce48fac7':
  vf_aspect: support variables in evaluating the aspect ratios

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/vf_aspect.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-03 11:54:19 +01:00
Rudolf Polzer
3a14b160bd vf_scale: make the dar variable return the DAR. 
Before, it just returned width/height. Correct is width/height*sar.

That way it is consistent with DAR as in probe output and setdar.

Signed-off-by: Rudolf Polzer <divverent@xonotic.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-11-02 21:16:29 +01:00
Rudolf Polzer
34a0ac41a8 vf_aspect: support variables in evaluating the aspect ratios 
Example: -vf setsar=sar="sar*9/10"

Signed-off-by: Rudolf Polzer <divverent@xonotic.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-11-02 21:14:08 +01:00
Timothy Gu
d3211cfaed avcodec/libmp3lame: add ABR support 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 18:44:20 +01:00
Michael Niedermayer
b594aceb94 Merge commit '5846646296e377e093441dfe9eadde38ff1f7c99' 
* commit '5846646296e377e093441dfe9eadde38ff1f7c99':
  Add raw HEVC demuxer

Conflicts:
	Changelog
	libavformat/hevcdec.c
	libavformat/version.h

See: 902a5fa722 and later commits
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 17:33:05 +01:00
Michael Niedermayer
5eb1704d5f Merge commit '064698d381e1e7790f21b0199a8930ea04e2e942' 
* commit '064698d381e1e7790f21b0199a8930ea04e2e942':
  Add HEVC decoder

Conflicts:
	Changelog
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/hevc.c
	libavcodec/hevc.h
	libavcodec/hevc_cabac.c
	libavcodec/hevc_filter.c
	libavcodec/hevc_mvs.c
	libavcodec/hevc_parser.c
	libavcodec/hevc_ps.c
	libavcodec/hevc_refs.c
	libavcodec/hevc_sei.c
	libavcodec/hevcdsp.c
	libavcodec/hevcdsp_template.c
	libavcodec/hevcpred.c
	libavcodec/hevcpred_template.c
	libavcodec/version.h

cosmetics from hevc.h & hevc_ps.c mostly merged, other files left as they where in ffmpeg.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 17:13:00 +01:00
Michael Niedermayer
78265fcfee Merge commit '28096e0a806e57376541e6222d315619906e3c55' 
* commit '28096e0a806e57376541e6222d315619906e3c55':
  h264: wait for initial complete frame before outputing frames

Conflicts:
	doc/APIchanges
	libavcodec/h264.c
	libavcodec/mpegvideo.h
	libavutil/frame.h
	libavutil/version.h

See: a64b028aeb (as well as various later commits)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 12:59:08 +01:00
Stefano Sabatini
2acc525d78 doc/encoders: add libfaac encoder documentation 2013-11-01 12:51:39 +01:00
Stefano Sabatini
d339e03fc3 doc/encoders: document the libfdk-aac wrapper 
Partially based on the https://trac.ffmpeg.org/wiki/AACEncodingGuide
guide.
 2013-11-01 12:51:39 +01:00
Stefano Sabatini
4fdec65eb3 doc/encoders: extend/clarify libtheora encoder documentation 2013-11-01 12:51:39 +01:00
Michael Niedermayer
a2bfee36b7 Merge commit '9af7a8523a6bb517834ebed36093bdab11a8b38e' 
* commit '9af7a8523a6bb517834ebed36093bdab11a8b38e':
  HNM4/HNM4A demuxer & video decoder

Conflicts:
	Changelog
	doc/general.texi
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/avcodec.h
	libavcodec/version.h
	libavformat/Makefile
	libavformat/allformats.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 10:46:39 +01:00
Anton Khirnov
fae753af70 avplay: drop -vismv option which does not do anything anymore 2013-10-31 20:22:22 +01:00
Dirk Farin
5846646296 Add raw HEVC demuxer 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-10-31 20:20:24 +01:00
Guillaume Martres
064698d381 Add HEVC decoder 
Initially written by Guillaume Martres <smarter@ubuntu.com> as a GSoC
project. Further contributions by the OpenHEVC project and other
developers, namely:

Mickaël Raulet <mraulet@insa-rennes.fr>
Seppo Tomperi <seppo.tomperi@vtt.fi>
Gildas Cocherel <gildas.cocherel@laposte.net>
Khaled Jerbi <khaled_jerbi@yahoo.fr>
Wassim Hamidouche <wassim.hamidouche@insa-rennes.fr>
Vittorio Giovara <vittorio.giovara@gmail.com>
Jan Ekström <jeebjp@gmail.com>
Anton Khirnov <anton@khirnov.net>
Martin Storsjö <martin@martin.st>
Luca Barbato <lu_zero@gentoo.org>
Yusuke Nakamura <muken.the.vfrmaniac@gmail.com>
Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Diego Biurrun <diego@biurrun.de>

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-10-31 20:19:59 +01:00
John Stebbins
28096e0a80 h264: wait for initial complete frame before outputing frames 
This can be optionally disabled whith the "output_corrupt" flags
option.  When in "output_corrupt" mode, incomplete frames are
signalled through AVFrame.flags FRAME_FLAG_INCOMPLETE_FRAME.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-10-31 20:14:14 +01:00
David Kment
9af7a8523a HNM4/HNM4A demuxer & video decoder 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-10-31 17:45:46 +01:00
Paul B Mahol
49287bbfd3 doc/filters: add few more examples for blend filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-31 13:36:57 +00:00
Clément Bœsch
0c6bb53bb2 doc/examples/demuxing: reset got_frame. 
Fix infinite loop at flushing.
 2013-10-30 14:37:58 +01:00
Stefano Sabatini
9fa0dccca6 lavc: extend documentation for the "bf" option 2013-10-29 18:30:27 +01:00
Stefano Sabatini
61c1f2cb1e doc/muxers: add definitory line for the MOV/MP4/ISMV muxer 
Also rename section name, to match the other ones adopting the muxer name
(rather than the related upcased standard name).
 2013-10-29 18:30:27 +01:00
Michael Niedermayer
0fef19b15a doc/RELEASE_NOTES: update for 2.1 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 01:13:46 +01:00
Michael Niedermayer
b85bf3423c doc/APIchanges: add 2 missing hashes & versions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 00:45:19 +01:00
Marton Balint
dbe6f9f2c2 lavc: add support for CODEC_CAP_DELAY in subtitles 
This patch adds CODEC_CAP_DELAY support to avcodec_decode_subtitle2.

For DVB teletext decoding, a single teletext packet can contain multiple
teletext pages. In order to support that, the teletext decoder may buffer
some pages.

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-27 23:12:41 +01:00
Paul B Mahol
292902ea9f avfilter: add mergeplanes filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-27 18:58:43 +00:00
Stefano Sabatini
5b53dd0803 doc/encoders: replace @xref with @ref command 
@xref is ignored by texi2pod.
 2013-10-27 15:32:25 +01:00
Timothy Gu
43041a7b4a doc/encoders: add libshine doc 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-10-27 13:02:32 +01:00
Stefano Sabatini
d3aa04b150 doc/protocols/rtp: apply misc fixes 
Partially suggested-by Burek Pekaric <burek021@gmail.com>.
 2013-10-27 12:44:48 +01:00
Stefano Sabatini
4e268285aa cmdutils: add -colors option 2013-10-27 09:18:45 +01:00
Stefano Sabatini
d61617a523 lavu/parseutils: add av_get_known_color_name() 2013-10-27 09:16:05 +01:00
Michael Niedermayer
444ce03f0f Merge remote-tracking branch 'cus/stable' 
* cus/stable:
  ffplay: add support for libswresample options
  ffplay: use av_frame_get_pkt_pos instead directly accessing pkt pos
  ffplay: factor out picture freeing code
  ffplay: update and extend documentation for channel and stream switching

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-26 13:54:29 +02:00
Marton Balint
060c42bc3d ffplay: update and extend documentation for channel and stream switching 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-10-26 12:23:54 +02:00
Michael Niedermayer
6889b78fe0 doc/issue_tracker: add 2 missing issue types 
Reviewed-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-26 11:29:42 +02:00
Stefano Sabatini
b4991292aa doc: add a few links to the Channel Layout syntax section 2013-10-25 15:44:12 +02:00
Stefano Sabatini
a3505136f9 doc/utils: document channel layout specification 2013-10-25 15:44:04 +02:00
Michael Niedermayer
52297945ec doc/issue_tracker: remove more mentions of patches 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-25 12:03:35 +02:00
Michael Niedermayer
cdb46f15ff doc/issue_tracker: update resolution names 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-25 11:36:46 +02:00
Michael Niedermayer
2a28bad822 doc/issue_tracker: remove patches as we dont use trac to handle patches 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-25 11:36:29 +02:00
Michael Niedermayer
3db7ae6a9a doc/issue_tracker: theres no substatus in trac 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-25 11:34:18 +02:00
Stefano Sabatini
af1c538850 doc/Makefile: fix man pages uninstall path 
Fix trac ticket #3054.
 2013-10-24 21:19:52 +02:00
burek
229042a52d doc/protocols: add description for the RTP protocol 
With some edits by Stefano.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-10-24 21:19:45 +02:00
Timothy Gu
6879fe4265 doc/codecs: update skip_alpha documentation 
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-10-24 11:32:56 +02:00
Timothy Gu
0be74cf0f5 doc/encoders: add libvorbis doc 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-10-24 11:32:56 +02:00
Lukasz Marek
759388aa71 lavd: add fbdev output device 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-10-24 08:16:17 +02:00
Luca Barbato
f825d42bcc avplay: Accept cpuflags option 
Quite useful for debugging.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-10-22 10:49:31 +02:00
Paul B Mahol
c9660999b9 avfilter: replaygain scanner 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-21 19:56:55 +00:00
Michael Niedermayer
a6388616e8 doc/developer: Add a policy item about updating the MAINTAINERs file 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-19 15:20:03 +02:00
Lukasz Marek
fb74c7e044 lavd/pulse_audio_dec: apply cosmetic changes 
In particular, fix punctuation in docs and make option help messages
grammatically consistent.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-10-18 23:26:55 +02:00
Stefano Sabatini
8696e51baf lavu/opt: add AV_OPT_TYPE_CHANNEL_LAYOUT and handler functions 
The new type is compatible with AV_OPT_TYPE_INT64, but allows to specify
channel layouts using the format accepted by av_get_channel_layout().
 2013-10-17 18:09:29 +02:00
Michael Niedermayer
9a63a45e48 doc/utils: fix docs build 
Not sure this is the correct solution but that can be investigated too once
the docs build again

Tested-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-16 22:32:47 +02:00
Timothy Gu
586b8ea248 doc/filters: reference ffmpeg-utils manual for color and sizes options 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-10-16 18:32:15 +02:00
Timothy Gu
155a5ff00d doc/utils: reformat doc for color syntax and add list of supported colors 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-10-16 18:32:15 +02:00
Timothy Gu
b4da1fa550 doc/utils: rewrite doc for time duration syntax 
Extend description and clarify syntax.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-10-16 18:32:15 +02:00
Lou Logan
a06dcde507 doc: make x11grab examples consistent with option names 
Change -r to -framerate, but either will work.
Change -s to -video_size, but either will work.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-10-14 23:08:52 +02:00
Michael Niedermayer
4b948dcadb doc/developer: Merge license related policy items 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-13 10:46:32 +02:00
Timothy Gu
024bf3a1c2 doc/codecs: Add missing mpeg2 aac profiles 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-11 20:00:06 +02:00
Timothy Gu
1fdae1017c doc/codecs: Add ignorecrop 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-11 19:59:49 +02:00
Timothy Gu
db4a677433 doc/codecs: Remove no longer existing options 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-11 19:59:07 +02:00
Timothy Gu
a55e813e53 doc/codecs: Cosmetics in the flags2 description 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-11 19:57:47 +02:00
Michael Niedermayer
dfb89fee2d doc/codecs: document skip_alpha 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-11 16:59:32 +02:00
Stefano Sabatini
f02bab6d09 doc/filters/scale: do not explicitly state the default swscale flags value 
This is done is order to avoid the need of synching scale with libswscale
docs in case the libswscale default changes.
 2013-10-11 16:40:20 +02:00
Michael Niedermayer
cdc9657a0c doc/codecs: Document field_order 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-10 16:03:37 +02:00
Timothy Gu
7ab8bceabc doc/encoder/aac: Remove -cutoff trick 
Fix Ticket #2686 comment 155.

Trick obsoleted since 72dabdfc58.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-10 13:43:56 +02:00
Clément Bœsch
56db86a0b2 doc/filters: remove extra spacing in vid.stab section. 2013-10-09 13:22:04 +02:00
Timothy Gu
df08fd5e1e doc/default.css + doc/t2h.init: New styles 
The main motive of this commit is to make the offline copy of the HTML doc as
pretty as the online (ffmpeg.org) one. This also introduced new styles for
<h2> to <h4>.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-09 04:01:46 +02:00
Lukasz Marek
361b56c379 lavd: pulse audio encoder 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-08 14:31:50 +02:00
Lukasz Marek
c21be5845f doc/indevs: make pulse dev formatting consistent with other devices 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-10-07 12:01:51 +02:00
Niv Sardi
49ba6e56bd lavu/parseutils: add more resolutions 
See http://en.wikipedia.org/wiki/Graphics_display_resolution

Signed-off-by: Niv Sardi <xaiki@evilgiggle.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-10-07 11:45:03 +02:00
Michael Niedermayer
931a4b433d avfilter/vf_scale: change the default scaler to bicubic 
See: [FFmpeg-devel] [PATCH] swscale/options: switch default to bicubic
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-06 11:00:48 +02:00
Michael Niedermayer
ccf96f8c64 swscale/options: switch default to bicubic 
Suggested-by: Ronald S. Bultje
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-06 10:47:09 +02:00
Michael Niedermayer
e57dba0d52 avcodec: add av_codec_get_max_lowres() 
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-03 16:33:09 +02:00
Marton Balint
0362cf1a19 avfilter/vf_histogram: add mirrored waveform mode 
Added parameter to mirror the waveform (high values are shown on top in column mode)

Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-10-02 21:02:59 +00:00
Michael Niedermayer
4c292d5c34 Merge remote-tracking branch 'rbultje/master' 
* rbultje/master:
  Full-pixel MC functions.
  VP9 MC (ssse3) optimizations.
  Native VP9 decoder.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-03 13:56:52 +02:00
Stefano Sabatini
f5b27b6d5f ffprobe: print stream channel_layout when available 
Fix trac ticket #3006.
 2013-10-03 09:19:38 +02:00
Ronald S. Bultje
848826f527 Native VP9 decoder. 
Authors: Ronald S. Bultje <rsbultje gmail com>,
         Clement Boesch <u pkh me>
 2013-10-02 21:03:11 -04:00
Michael Niedermayer
5082fcc0e2 avformat: add support to force specific AVCodecs 
previously only codec_ids could be forced, which did not allow
forcing a specific implementation like libopenjpeg vs jpeg2000.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-02 22:56:03 +02:00
Paul B Mahol
edadda968c avfilter/vf_histogram: change order of histograms for planar rgb 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-01 21:22:22 +00:00
Stefano Sabatini
8fafaf1834 doc: move sws_dither option description to scaler.texi 
That's the more proper place where the scaler options should be
documented.
 2013-09-30 16:54:46 +02:00
Stefano Sabatini
d17aaad630 doc/filters/scale: mention and link scaler options 2013-09-30 16:50:44 +02:00
Stefano Sabatini
fd0a1647f2 doc/filters/scale: fix MAN rendering of @ref arguments 2013-09-30 16:43:33 +02:00
Michael Niedermayer
31b6300f4d doc: try to add a link from the vf_scale sws_flags to the scaler docs 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-30 16:09:58 +02:00
Timothy Gu
8fd8ead23c doc/t2h.init: remove resource-type and distribution meta elements 
The W3C validator complains about these.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-09-30 11:56:16 +02:00
Clément Bœsch
565fd3cc1a doc/faq: add @command{} in the tool debug entry. 2013-09-29 23:31:12 +02:00
Clément Bœsch
2e798c6ce0 doc/faq: remove indent in examples. 
CSS should take care of this.
 2013-09-29 23:31:12 +02:00
Clément Bœsch
eafb9c52e8 doc/faq: remove Delphi/Pascal entry. 
Link is dead.
 2013-09-29 23:31:12 +02:00
Clément Bœsch
e6273592e4 doc/faq: rework r_frame_rate entry. 2013-09-29 23:31:12 +02:00
Paul B Mahol
5a47f12390 doc/demuxers: fix image2 examples 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-29 16:36:25 +00:00
Michael Niedermayer
7381d31f22 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavfi: allow user-provided execute() callbacks

Conflicts:
	libavfilter/avfilter.h
	libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-28 11:02:01 +02:00
Anton Khirnov
0767bfd199 lavfi: allow user-provided execute() callbacks 2013-09-28 08:06:19 +02:00
Georg Martius
e064d0aaf6 avfilter/vidstabtransform: update optzoom range values for recent vid.stab update. 
Signed-off-by: Georg Martius <martius@mis.mpg.de>
 2013-09-27 16:48:31 +00:00
Paul B Mahol
110a2f446d avfilter/af_ladspa: allow changing controls dynamically 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-27 12:49:55 +00:00
Michael Niedermayer
f31c36e552 Merge commit '705b748e8d8612385c96428ae36ed0d42a170d93' 
* commit '705b748e8d8612385c96428ae36ed0d42a170d93':
  tls: Add support for listen mode

Conflicts:
	doc/protocols.texi
	libavformat/tls.c
	libavformat/version.h

See: 4f4eb380f0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-27 11:33:19 +02:00
Michael Niedermayer
e6e71fd7b5 Merge commit '8b09d917e7dc7d7f2ace31419f802d4ff518236c' 
* commit '8b09d917e7dc7d7f2ace31419f802d4ff518236c':
  tls: Add options for verifying the peer certificate

Conflicts:
	doc/protocols.texi
	libavformat/tls.c
	libavformat/version.h

See: b2460858f6
See: 973a758f52
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-27 09:33:28 +02:00
Paul B Mahol
7e52080cb1 pcm: support 24-bit/32-bit little-endian planar 
Used by LXF.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-09-27 01:33:45 +02:00
Martin Storsjö
705b748e8d tls: Add support for listen mode 
Also add options for specifying a certificate and key, which can
be used both when operating as client and as server.

Partially based on a patch by Peter Ross.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-09-26 23:13:35 +03:00
Martin Storsjö
8b09d917e7 tls: Add options for verifying the peer certificate 
A file containing the trusted CA certificates needs to be
supplied via the ca_file AVOption, unless the TLS library
has got a system default file/database set up.

This doesn't check the hostname of the peer certificate with
openssl, which requires a non-trivial piece of code for
manually matching the desired hostname to the string provided
by the certificate, not provided as a library function.

That is, with openssl, this only validates that the received
certificate is signed with the right CA, but not that it is
the actual server we think we're talking to.

Verification is still disabled by default since we can't count
on a proper CA database existing at all times.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-09-26 23:13:06 +03:00
Anton Khirnov
2725f2d403 doc/filters: fix an option name in the unsharp docs 2013-09-24 17:22:11 +02:00
Lukasz Marek
23ad4d6f58 doc/outdevs: add sdl window_fullscreen option 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-23 23:37:14 +02:00
Timothy Gu
ca10d66719 doc/filters: add [] labels for the graph of the opening paragraph example 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-09-23 00:11:56 +02:00
Stefano Sabatini
21f6ff3801 doc/filters: use between() function in select examples 
Simplify.
 2013-09-22 23:54:39 +02:00
Stefano Sabatini
57618d80af doc/fftools: rework some paragraph in the AVOptions chapter 
Fix typos, and clarify note about codec AVOptions.
 2013-09-22 23:54:39 +02:00
Paul B Mahol
0de4efb8d7 doc/filters: put ladspa configure option into @code{} 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-22 20:41:01 +00:00
Paul B Mahol
f8e8932e92 doc/filters: mention configure option for ladspa 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-22 18:45:50 +00:00
Paul B Mahol
601eab2bbf avfilter: add ladspa wrapper filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-22 16:36:10 +00:00
Michael Niedermayer
85f8a3cb50 Merge commit 'e208e6d209728d332343aa5390ae377ac0a6305c' 
* commit 'e208e6d209728d332343aa5390ae377ac0a6305c':
  lavu: Add interleaved 4:2:2 8/10-bit formats

Conflicts:
	doc/APIchanges
	libavutil/pixdesc.c
	libavutil/pixfmt.h
	libavutil/version.h

See: 90ca5a9b5f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-22 11:42:03 +02:00
Kieran Kunhya
e208e6d209 lavu: Add interleaved 4:2:2 8/10-bit formats 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-09-21 17:36:15 +02:00
Carl Eugen Hoyos
ac82155204 Remove '-vf' from pullup documentation example. 2013-09-21 12:17:20 +02:00
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