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

3991 Commits

Author SHA1 Message Date
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
Stefano Sabatini
3f8750776f doc/protocols: apply very minor consistency fixes 2013-06-21 17:47:34 +02:00
Andrey Utkin
3857aea6d9 doc/protocols: document "srtp" protocol 
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-06-21 17:47:19 +02:00
Timothy Gu
b43860ee0c doc/decoders: Document libopencore-amrnb decoder 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-21 12:26:34 +02:00
Timothy Gu
8cdea50f6e doc/decoders: Document libilbc decoder 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-21 03:46:22 +02:00
Andrey Utkin
2d70f11ef5 Document "sctp" protocol 
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-20 14:56:40 +02:00
Andrey Utkin
f9739a34ad Document "crypto" protocol 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-20 03:01:22 +02:00
Timothy Gu
c16496c377 doc/decoders: Document libgsm decoder 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-20 02:45:18 +02:00
Timothy Gu
9ead06057a doc/encoders: Add libopencore-amrnb doc 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-19 01:42:55 +02:00
Michael Niedermayer
602d0bfe67 Merge branch 'frame_num_offset' of https://github.com/mjmvisser/FFmpeg 
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-19 01:25:50 +02:00
Timothy Gu
e358044922 doc/decoders: Document libcelt 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-18 18:03:22 +02:00
Matthew Heaney
b24f15c45e lavf: add WebVTT muxer. 
This revision creates a WebVTT muxer, that outputs files having the
format described in the following specification:

http://dev.w3.org/html5/webvtt/
 2013-06-17 22:28:19 +02:00
James Almer
99b8cd0c81 lavu: Add RIPEMD hashing 
Includes RIPEMD-128, RIPEMD-160, RIPEMD-256 and RIPEMD-320

Signed-off-by: James Almer <jamrial@gmail.com>
 2013-06-15 18:54:01 -03:00
Andrey Utkin
194fde3834 Document "cache" protocol 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-15 23:26:18 +02:00
Mark Visser
0defc77e9d added start_number parameter to drawtext to permit an offset to n/frame_num var 2013-06-14 17:05:19 -04:00
Timothy Gu
6fe419bf73 doc/general: Make the license status of the Android libraries clearer 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-14 03:58:39 +02:00
Jean Delvare
cef42ded8d drawbox: Respect thickness parameter 
The drawbox video filter is drawing lines one pixel thinner than
requested. The default thickness is 4 pixel but in fact the lines
drawn by default are only 3 pixel wide.

Change the comparisons in the code to fix this off-by-one bug. Also
change the default thickness from 4 to 3 to minimize the unexpected
changes from the user's perspective.

As I was already touching these lines, I also removed the "maximum" in
the thickness parameter description, as I don't think it was adding
any value and I even found it confusing.

Reviewed-by: Andrey Utkin <andrey.krieger.utkin@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-14 03:52:32 +02:00
Clément Bœsch
852f74bd85 lavfi/mp: remove mp=spp. 
The filter was ported to a native libavfilter filter.
 2013-06-14 01:27:22 +02:00
Clément Bœsch
a2c547ffec lavfi: add spp filter. 2013-06-14 01:27:22 +02:00
Stefano Sabatini
e0135a4bcd lavfi/rotate: add angle command 2013-06-13 01:21:47 +02:00
Stefano Sabatini
dc5e26d67f lavfi: add rotate filter 
Based on the libavfilter SOC filter by Vitor Sessak, with the following additions:
* integer arithmetic
* bilinear interpolation
* RGB path
* configurable parametric angle, output width and height

Address trac issue #1500.

See thread:
Subject: [FFmpeg-devel] [WIP] rotate filter(s)
Date: 2010-10-03 17:35:49 GMT
 2013-06-13 01:21:47 +02:00
Timothy Gu
0ec65aa104 doc/encoders: Add libvo-amrwbenc doc 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-12 23:37:35 +02:00
Paul B Mahol
df084adbf7 doc/general: s/Libav/FFmpeg 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-11 20:53:21 +00:00
Michael Niedermayer
73d5cf8f43 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavc: add a libwavpack encoder wrapper

Conflicts:
	Changelog
	doc/encoders.texi
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-11 09:36:34 +02:00
Stefano Sabatini
57655c6080 doc/metadata: add notes and examples regarding metadata usage with ffmpeg 2013-06-11 01:07:16 +02:00
Anton Khirnov
84d3ff50cd lavc: add a libwavpack encoder wrapper 2013-06-10 21:33:48 +02:00
Michael Niedermayer
f320b00541 doc/codecs: Mention relation of the experimental setting and codecs 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-08 14:14:27 +02:00
Timothy Gu
ba7cb4807f doc/encoders: Add libvo-aacenc doc 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-08 13:52:34 +02:00
Tim.Nicholson
0ea1356137 doc/filters: fix alias option name for chroma_mode in 'il' filter. 2013-06-07 16:34:00 +02:00
James Almer
b06717ef40 APIchanges: Add missing entry for SHA-2 512 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-06 18:13:06 +02:00
Stefano Sabatini
4da5402256 ffprobe: show chapter and chapter metadata information 
Address trac ticket #2636.
 2013-06-06 16:49:53 +02:00
Michael Niedermayer
30b491f1c9 Merge commit '3b4feac1ec14f861bdd7f494f288f4d8dd7f449e' 
* commit '3b4feac1ec14f861bdd7f494f288f4d8dd7f449e':
  movenc: Keep track of the allocated size for the cluster array
  mem: Add av_realloc_array and av_reallocp_array

Conflicts:
	doc/APIchanges
	libavformat/movenc.c
	libavutil/mem.c
	libavutil/mem.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 11:19:16 +02:00
Timothy Gu
ea038b996d doc/encoders: add documentation for libtwolame 2013-06-05 08:33:13 +00:00
Stefano Sabatini
449558d34a lavfi/mp: remove mp=sab 
The filter was ported to a native libavfilter filter.
 2013-06-05 00:06:51 +02:00
Stefano Sabatini
841df7bf86 lavfi: port sab filter from libmpcodecs 2013-06-05 00:06:51 +02:00
Paul B Mahol
0804171104 swresample: set flags & description and add documentation for output_sample_bits 
Allows users to actually use such option.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-04 21:57:25 +00:00
Paul B Mahol
e3e398b80b doc/general: update after e4e4add0e3 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-04 21:43:59 +00:00
Martin Storsjö
fc962d4e7a mem: Add av_realloc_array and av_reallocp_array 
These help avoiding overflows and simplify error handling.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-06-04 15:04:08 +03:00
Michael Niedermayer
e5cdf9c03b Merge commit '2d66a58ccde05e764594bd7e5f0f9244634d0b2c' 
* commit '2d66a58ccde05e764594bd7e5f0f9244634d0b2c':
  Go2Webinar decoder

Conflicts:
	Changelog
	configure
	libavcodec/avcodec.h
	libavcodec/codec_desc.c
	libavcodec/version.h
	libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 12:47:26 +02:00
Kostya Shishkov
2d66a58ccd Go2Webinar decoder 2013-06-03 09:24:55 +02:00
Paul B Mahol
514cb9bb92 tta encoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-02 15:16:52 +00:00
Stefano Sabatini
ec34963276 lavfi/mp: drop mcdeint wrapper 
It was ported to a native libavfilter filter.
 2013-06-01 22:35:20 +02:00
Stefano Sabatini
e89182fc94 lavfi: port mcdeint filter from libmpcodecs 2013-06-01 22:34:57 +02:00
Michael Niedermayer
f0b9bd807b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  proresenc: alpha coding support

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-31 11:32:58 +02:00
Clément Bœsch
2886e8065e lavfi/vignette: add aspect option. 2013-05-30 20:51:12 +02:00
Clément Bœsch
0ab9362fcb lavfi: add vignette filter. 2013-05-30 17:52:52 +02:00
Stefano Sabatini
f7a267affe doc/encoders: remove duplicated "the" 2013-05-30 10:44:54 +02:00
Stefano Sabatini
9f8937b5ef lavd: add xv output device 
Based on the work of Jeff Moguillansky <Jeff.Moguillansky@am.sony.com>.

See thread:
Subject: [FFmpeg-devel] x11 output device for libavdevice
Date: Wed, 10 Apr 2013 23:10:47 +0000
 2013-05-30 10:44:54 +02:00
Kostya Shishkov
0b0953baec proresenc: alpha coding support 2013-05-30 09:23:26 +02:00
Michael Niedermayer
4ea5aea869 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  doc: Mention the target_samples and ld variables for fate configs
  fate.sh: Allow specifying --as via a specific variable

Conflicts:
	doc/fate.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-29 11:19:25 +02:00
Martin Storsjö
a51161ed98 doc: Mention the target_samples and ld variables for fate configs 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-29 10:37:18 +03:00
Martin Storsjö
d7b9b66abb fate.sh: Allow specifying --as via a specific variable 
This simplifies specifying a value containing spaces for this
parameter.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-29 10:37:05 +03:00
Clément Bœsch
158d96e3f0 lavfi: add haldclut filter. 
Fixes Ticket #2517.
 2013-05-27 20:42:28 +02:00
Clément Bœsch
3cec29cf59 lavfi: add haldclutsrc filter. 2013-05-27 20:32:28 +02:00
Paul B Mahol
7aa99a69c7 lavfi/bbox: make min_val user configurable 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-26 14:00:09 +00:00
Timothy Gu
4703a345fb doc/encoders: Add documentation for libmp3lame 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-25 23:56:49 +02:00
Andrey Utkin
70fbfd75c3 img2dec: Add ts_from_file option 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-25 11:42:28 +02:00
Michael Niedermayer
8d4e969afe Merge commit '129bb238430ec45a3b5f8f1d384df590ddf7b62f' 
* commit '129bb238430ec45a3b5f8f1d384df590ddf7b62f':
  lavfi: add a slice threading infrastructure

Conflicts:
	Changelog
	cmdutils.c
	doc/APIchanges
	libavfilter/Makefile
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/avfiltergraph.c
	libavfilter/internal.h
	libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 14:07:00 +02:00
Michael Niedermayer
fe40a9f98f Merge commit '2a6eaeaa85d17b27ee0dd449183ec197c35c9675' 
* commit '2a6eaeaa85d17b27ee0dd449183ec197c35c9675':
  Move get_logical_cpus() from lavc/pthread to lavu/cpu.

Conflicts:
	doc/APIchanges
	libavcodec/pthread.c
	libavutil/cpu.c
	libavutil/cpu.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 13:24:28 +02:00
Michael Niedermayer
ecbd96ed23 Merge commit 'e69222c50755030eef921e899e38b71a111093d9' 
* commit 'e69222c50755030eef921e899e38b71a111093d9':
  doxy: enable TYPEDEF_HIDES_STRUCT

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 12:25:21 +02:00
Michael Niedermayer
0c25c398da Merge commit 'b493847df4ff8ce46f258749e4a3f304696b34c1' 
* commit 'b493847df4ff8ce46f258749e4a3f304696b34c1':
  avcodec: Add picture structure information to AVCodecParserContext.

Conflicts:
	doc/APIchanges
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 11:51:58 +02:00
Anton Khirnov
129bb23843 lavfi: add a slice threading infrastructure 
Mostly based on libavcodec's
 2013-05-24 09:28:18 +02:00
Anton Khirnov
2a6eaeaa85 Move get_logical_cpus() from lavc/pthread to lavu/cpu. 
It will be useful in lavfi, and could conceivably be useful to the user
applications as well.
 2013-05-24 09:28:00 +02:00
Anton Khirnov
e69222c507 doxy: enable TYPEDEF_HIDES_STRUCT 
This means that typedef struct SomeStruct {...} SomeStruct will only be
documented as SomeStruct in the doxy, without a pointless entry in the
typedefs list.
 2013-05-24 09:12:00 +02:00
Yusuke Nakamura
b493847df4 avcodec: Add picture structure information to AVCodecParserContext. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-05-24 08:43:14 +02:00
Clément Bœsch
d51dfc7ec4 doc/filters: fix wording of color option in testsrc filters. 2013-05-23 17:22:05 +02:00
Clément Bœsch
a0a41db339 lavfi/testsrc: make nb_decimals available only in testsrc. 2013-05-23 17:22:05 +02:00
Darryl Wallace
3e16047507 s302m encoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-23 12:03:06 +00:00
Paul B Mahol
591fa05278 doc/general: remove obsolete info about APE decoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-23 09:32:12 +00:00
Clément Bœsch
165bc9caa2 v4l2: make possible to disable libv4l2 at runtime. 
Also disable it by default since it looks currently buggy. The
usefulness of such library is mostly limited to backward compatibility
with very old devices.
 2013-05-22 19:49:29 +02:00
Clément Bœsch
12f51c1f9e lavfi: add lut3d filter. 
Fixes part of Ticket #2517.
 2013-05-22 18:23:43 +02:00
Stefano Sabatini
2210003b7f lavfi/geq: add aliases for RGB options 2013-05-21 21:15:00 +02:00
Michael Niedermayer
877cae6eff Merge commit 'c209d0df657f172f42d9bafbcdfa02dfb14f6965' 
* commit 'c209d0df657f172f42d9bafbcdfa02dfb14f6965':
  fate.sh: add support for build-only FATE instances

Conflicts:
	doc/fate.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-21 11:36:49 +02:00
Diego Biurrun
c209d0df65 fate.sh: add support for build-only FATE instances 
If the "build_only" variable is set in the configuration file, the
FATE client will skip running tests and just compile all targets.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-21 10:07:19 +03:00
Stefano Sabatini
6e7c534955 doc/filters: add RGB geq example 2013-05-20 11:12:09 +02:00
Stefano Sabatini
281fc4e958 doc/filters: extend/fix documentation for the geq filter 2013-05-20 11:12:04 +02:00
Clément Bœsch
16a75eaa20 lavd: add v4l2 outdev. 2013-05-20 01:11:33 +02:00
Stefano Sabatini
be3f4c13b6 doc/Makefile: install .3 man pages to man3 subdir 
Fix trac ticket #2585.
 2013-05-19 19:26:25 +02:00
Stefano Sabatini
90cb081f88 build: drop unused ALLMANPAGES variable 2013-05-19 19:26:21 +02:00