virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
58,454 Commits 37 Branches 400 Tags 465 MiB
325c918fa3
Commit Graph

4284 Commits

Author SHA1 Message Date
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