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
55,599 Commits 37 Branches 400 Tags 465 MiB
e74a5acb40
Commit Graph

3871 Commits

Author SHA1 Message Date
Paul B Mahol
e74a5acb40 lavfi/transpose: support slice threading 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-16 12:40:02 +00:00
Paul B Mahol
ef6718a5f7 lavfi/tile: make color of blank/unused area configurable 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-16 12:40:01 +00:00
Michael Niedermayer
ec0e0eb4c1 avfilter/vf_scale+aresample: minor simpification 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-16 04:26:59 +02:00
Michael Niedermayer
6d246f440e avfilter/vf_scale: generic swscale option support 
With this all AVOptions from swscale can be set without each needing
changes to vf_scale.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-15 23:23:58 +02:00
Paul B Mahol
11afe28b9a lavfi/ebur128: fix typo: s/negociation/negotiation 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-13 12:43:56 +00:00
Paul B Mahol
9087dcbe5b lavfi/trim: check for right default value 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-12 10:56:52 +00:00
Thilo Borgmann
f18ccb529f Fix wrong use of "an" in some comments. 2013-08-12 03:27:26 +02:00
Michael Niedermayer
0b5627189d avfilter/f_sendcmd: make const arrays static const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-10 18:44:39 +02:00
Michael Niedermayer
c9837613ed avfilter/trim: Fix assertion failure with empty frames 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-09 11:54:40 +02:00
Michael Niedermayer
190a5893d1 avfilter/fifo: explicitly assert that a frame should have become available after request 
May help tools like coverity

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-09 09:28:11 +02:00
Michael Niedermayer
3b2e99fe9e avfilter/vf_perspective: factor u cliping code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-09 00:03:43 +02:00
Michael Niedermayer
bb5ef96164 Merge commit '3799376dd3373ee255651ed542c75b15665801a8' 
* commit '3799376dd3373ee255651ed542c75b15665801a8':
  lavfi/fifo: fix flushing when using request_samples

Conflicts:
	libavfilter/fifo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 09:35:03 +02:00
Anton Khirnov
3799376dd3 lavfi/fifo: fix flushing when using request_samples 
If any samples are still buffered when request_frame returns EOF, they
won't be returned currently.
 2013-08-05 10:52:00 +02:00
Michael Niedermayer
46b3dbf9ca Merge commit '77cc958f60f73963be4281d6e82ef81707e40c26' 
* commit '77cc958f60f73963be4281d6e82ef81707e40c26':
  lavfi: add const to the AVFilter parameter of avfilter_graph_create_filter()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-05 09:22:18 +02:00
Anton Khirnov
77cc958f60 lavfi: add const to the AVFilter parameter of avfilter_graph_create_filter() 
This function should never modify the filter.
 2013-08-04 15:46:19 +02:00
Timothy Gu
3415058541 vf_scale: add force_original_aspect_ratio 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-04 13:27:01 +02:00
Michael Niedermayer
61af627d56 avfilter/graphparser: remove 256 char limit from create_filter() 
Fixes Ticket2803

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-04 00:56:55 +02:00
Michael Niedermayer
e43a0a232d avfilter: fix plane validity checks 
Fixes out of array accesses

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-03 19:15:46 +02:00
Michael Niedermayer
20be5e0a0e Merge commit '7950e519bb094897f957b9a9531cc60ba46cbc91' 
* commit '7950e519bb094897f957b9a9531cc60ba46cbc91':
  Disable deprecation warnings for cases where a replacement is available

Conflicts:
	libavcodec/avpacket.c
	libavcodec/pthread.c
	libavcodec/utils.c
	libavdevice/v4l2.c
	libavfilter/avfiltergraph.c
	libavfilter/buffersrc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-03 10:08:30 +02:00
Michael Niedermayer
a8e963835a Merge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e' 
* commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e':
  Give less generic names to global library option arrays

Conflicts:
	libavcodec/options_table.h
	libavfilter/avfilter.c
	libavformat/options_table.h
	libswscale/options.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-03 09:16:36 +02:00
Diego Biurrun
7950e519bb Disable deprecation warnings for cases where a replacement is available 2013-08-02 19:19:02 +02:00
Diego Biurrun
b5a138652f Give less generic names to global library option arrays 2013-08-02 19:19:02 +02:00
Michael Niedermayer
0c8efe4891 Merge commit '45dd1ae1b3c18331f3db2293a9135bc5851e553f' 
* commit '45dd1ae1b3c18331f3db2293a9135bc5851e553f':
  avfilter: Add some missing FF_API_AVFILTERBUFFER ifdefs

Conflicts:
	libavfilter/buffer.c
	libavfilter/internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-01 11:36:54 +02:00
Diego Biurrun
45dd1ae1b3 avfilter: Add some missing FF_API_AVFILTERBUFFER ifdefs 2013-07-31 19:23:00 +02:00
Michael Niedermayer
1bbf94d84f avfilter/af_compand: %f is for printing doubles 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-30 22:24:42 +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
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
Michael Niedermayer
b0edd59994 Merge commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2' 
* commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2':
  Add missing deprecation attributes

Conflicts:
	libavfilter/avfilter.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-28 13:44:34 +02:00
Michael Niedermayer
edab63a406 Merge commit '966689442ed843019dc0722a49bfb0ac51755d19' 
* commit '966689442ed843019dc0722a49bfb0ac51755d19':
  buffersink: K&R formatting cosmetics

Conflicts:
	libavfilter/buffersink.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-28 11:26:57 +02:00
Diego Biurrun
bf4b0ed1d5 Add missing deprecation attributes 2013-07-27 16:08:49 +02:00
Diego Biurrun
966689442e buffersink: K&R formatting cosmetics 2013-07-27 10:47:38 +02:00
Michael Niedermayer
8720d3ac21 avfilter/vf_scale: set in_color_matrix default to "auto" 2013-07-27 01:16:07 +02:00
Michael Niedermayer
f3f4e133d6 avfilter/vf_scale: use sws_getCoefficients() 
Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-26 23:07:19 +02:00
Paul B Mahol
be7d6710b4 lavfi/frei0r: use AV_OPT_TYPE_IMAGE_SIZE 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-26 17:16:26 +00:00
Hendrik Leppkes
779e6c2b98 lavfi: add attribute_align_arg to all public entry points 
Previously it was partly only added to central functions called
internally, however if GCC would inline these into the public fuction, the
alignment attribute would not take effect.

Instead, add it to all public entry points to avoid these problems.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-26 19:51:04 +03:00
Paul B Mahol
7ac736afbd lavfi/frei0r: use AV_OPT_TYPE_VIDEO_RATE 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-26 15:24:55 +00:00
Paul B Mahol
a4b899f588 lavfi/gradfun: remove nv21/nv12 as they are not supported 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-26 15:07:12 +00:00
Hendrik Leppkes
af2a196e66 lavfi: add attribute_align_arg to all public entry points 
Previously it was partly only added to central functions called
internally, however if GCC would inline these into the public fuction, the
alignment attribute would not take effect.

Instead, add it to all public entry points to avoid these problems.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-26 13:59:30 +02:00
Paul B Mahol
2a1a599bcb lavfi/buffersrc: remove unused item from BufferSourceContext 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-26 11:43:43 +00:00
Michael Niedermayer
de0a1f63df avfilter/can_merge_formats: fix memleak 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-25 16:54:04 +02:00
Michael Niedermayer
6bde1e9d14 avfilter/avfiltergraph: fix check using the wrong variables 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-25 16:53:39 +02:00
Michael Niedermayer
5156d482cd avfilter/vf_scale: use the inputs color range when its set and its not overridden 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-25 02:50:46 +02:00
Michael Niedermayer
24a4367ae9 vf_scale: add input h/v_chr_pos parameters 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-24 18:33:58 +02:00
Michael Niedermayer
e31d20255d vf_scale: add output h/v_chr_pos parameterss 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-24 18:27:10 +02:00
Michael Niedermayer
6a0b72f94f avfilter/avfiltergraph: minor cosmetic 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-23 20:58:21 +02:00
Michael Niedermayer
fe328f0807 avfilter: Dont partially merge lists 
This prevents the unneeded insertion of multiple aresample filters in some cases

The format merging is moved to avoid having to call the channel layout
merge twice. The channel layout merge code uses different structures and
is not compatible with the added dry run wrappers.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-23 19:14:04 +02:00
Michael Niedermayer
5169111145 avfilter/REDUCE_FORMATS: fix bug that ended reducing too early 
Prior to this it was possible that format reduction was ended
before it fully propagated leading to failure later in picking
formats.
No testcase with unmodified source exists, the case was reproduced
with less aggressive list merging though.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-22 02:48:13 +02:00
Michael Niedermayer
1f7acf3cff vfilter/vf_scale: avoid using "{}" 
Should fix compile issues with MSVC

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-21 04:47:09 +02:00
Michael Niedermayer
3242747df3 avfilter/vf_scale; fix indent 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-20 22:20:25 +02:00