generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
56,196 Commits 24 Branches 241 Tags 173 MiB
269845db86
Commit Graph

4097 Commits

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