virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-03 05:10:03 +02:00
Code Issues Releases Activity
51,527 Commits 37 Branches 400 Tags 467 MiB
e7692a9bac
Commit Graph

3074 Commits

Author SHA1 Message Date
Clément Bœsch
44f3d21799 lavfi/aevalsrc: raise filter_frame() error. 2013-03-13 19:00:09 +01:00
Clément Bœsch
1b0d0e6b72 lavfi/atempo: raise filter_frame() error. 2013-03-13 19:00:09 +01:00
Clément Bœsch
dda59d9adc lavfi/asetnsamples: raise filter_frame() error. 2013-03-13 19:00:08 +01:00
Clément Bœsch
c82bb2815b lavfi/aresample: raise filter_frame() error. 2013-03-13 19:00:08 +01:00
Michael Niedermayer
c31f07574d Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  hqdn3d: Fix out of array read in LOWPASS
  cabac: remove unused argument of ff_init_cabac_states()
  rawdec: fix a typo -- || instead of |

Conflicts:
	libavcodec/cabac.c
	libavcodec/h264.c
	libavfilter/vf_hqdn3d.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 14:49:00 +01:00
Michael Niedermayer
8bcebf9e4a Merge commit '555000c7d5c1e13043a948ebc48d2939b0ba6536' 
* commit '555000c7d5c1e13043a948ebc48d2939b0ba6536':
  h264: check that DPB is allocated before accessing it in flush_dpb()
  vf_hqdn3d: fix uninitialized variable use
  vf_gradfun: fix uninitialized variable use

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 13:34:06 +01:00
Loren Merritt
5b3c1aecb2 hqdn3d: Fix out of array read in LOWPASS 
CC:libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-03-13 09:14:59 +01:00
Stefano Sabatini
aeac1dae29 lavfi/fieldorder: add support to named options 2013-03-13 00:37:13 +01:00
Stefano Sabatini
a3233e9d7a lavfi/fieldorder: remove unused headers and commented define 2013-03-13 00:34:51 +01:00
Nicolas George
c14a8c834c lavfi/buffersink: schedule removing the "ff" variants. 
They are no longer needed since there is no incompatible
ABI version.
 2013-03-12 23:31:07 +01:00
Nicolas George
9a2688826d lavfi/buffersink: rename filter structures. 
Reduce the diff with the fork.
 2013-03-12 23:31:07 +01:00
Michael Niedermayer
212b89f8b4 avfilter: remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 21:23:54 +01:00
Michael Niedermayer
0cfbfaaa12 Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241' 
* commit '7b89cd20d844cbe763ca34e63e99d110043cf241':
  eamad: allocate a dummy reference frame when the real one is missing
  Replace remaining includes of audioconvert.h with channel_layout.h
  Replace some forgotten instances of PIX_FMT_* with AV_PIX_FMT_*.

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 15:44:15 +01:00
Michael Niedermayer
a75f01d7e0 Merge commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111' 
* commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111':
  Add the bumps and APIchanges entries for reference counted buffers changes.

Conflicts:
	Changelog
	doc/APIchanges
	libavcodec/version.h
	libavdevice/version.h
	libavfilter/version.h
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 15:35:39 +01:00
Hendrik Leppkes
c69acbf881 lavfi/moviesrc: use refcounted frames 2013-03-12 03:23:57 +01:00
Nicolas George
73b40e2eb6 lavfi/buffersink: move the filter structures at the end. 
Also apply a few cosmetic fixes (spaces, trailing comma) to
help match them with the fork's implementation.
 2013-03-11 19:00:49 +01:00
Anton Khirnov
d0a863ac89 vf_hqdn3d: fix uninitialized variable use 
CC:libav-stable@libav.org
 2013-03-11 18:28:35 +01:00
Anton Khirnov
887d31d455 vf_gradfun: fix uninitialized variable use 
CC:libav-stable@libav.org
 2013-03-11 18:28:34 +01:00
Nicolas George
de54a96aa8 lavfi/buffersink: implement av_buffersink_get_samples(). 
Note: the implementation could be more efficient, but at
the cost of more diff.

Most of the code from the following commit:

commit a2cd9be212
Author: Anton Khirnov <anton@khirnov.net>
Date:   Fri May 4 19:22:38 2012 +0200

    lavfi: add an audio buffer sink.

Adapted to call av_buffersink_get_frame_flags() instead of
accessing the frame directly.
 2013-03-10 19:39:25 +01:00
Nicolas George
b71db3f38e lavfi/buffersrc: do not dereference NULL frame. 
frame = NULL is used to indicate EOF.
 2013-03-10 17:05:55 +01:00
Nicolas George
03b87fe5e3 lavfi: rename sink_buffer.c into buffersink.c. 2013-03-10 17:05:55 +01:00
Nicolas George
3add5dc88e lavfi: remove buffersink.c. 
It only contains merge conflicts leftovers.
The real code is in sink_buffer.c.
 2013-03-10 17:05:55 +01:00
Nicolas George
fa41f7ecd6 lavfi/sink_buffer: move stuff to reduce the diff. 
Note: av_buffersink_get_samples() is not yet implemented,
abuffersink is not yet a drop-in replacement of the fork's
abuffersink.
 2013-03-10 17:05:46 +01:00
Stefano Sabatini
35135a3989 lavfi/smartblur: add support to named options 2013-03-10 16:38:45 +01:00
Nicolas George
b0012de420 lavfi/buffersrc: implement flags. 
The PUSH flags is necessary for efficient scheduling;
otherwise there is no feedback when adding frames to
closed paths.

The NO_CHECK_FORMAT is a small optimization that does
not cost much to implement.

The KEEP_REF flag maps to the add/write distinction in
the fork's API.
 2013-03-10 13:56:17 +01:00
Stefano Sabatini
606efe18be lavfi/unsharp: add missing option flags 2013-03-10 13:22:58 +01:00
Michael Niedermayer
f963c77856 avfilter: avoid direct access to "frame"->channels 
This avoids ABI issues

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-10 11:25:54 +01:00
Xi Wang
5d639b2b4a vf_pad: fix a & instead of && typo 
Avoid buffer overflow in buffer_needs_copy()

Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-03-10 11:16:10 +01:00
Xi Wang
969e8d35b5 lavfi/pad: avoid buffer overflow in buffer_needs_copy() 
Replace & with short-circuit &&.

Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-03-10 10:38:42 +01:00
Clément Bœsch
65fc80f012 lavfi: add curves filter. 2013-03-10 03:00:10 +01:00
Clément Bœsch
3d813e7ec3 lavfi: bump minor version after the first round of evil changes. 2013-03-10 02:59:43 +01:00
Michael Niedermayer
108434a30c sink_buffer: remove unused variables 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-10 02:52:15 +01:00
Clément Bœsch
96e4b00d62 lavfi: remove remaining forgotten min/rej perms. 2013-03-10 02:38:21 +01:00
Clément Bœsch
f0a5f71074 lavfi/hue: reindent. 2013-03-10 02:13:02 +01:00
Clément Bœsch
3da54858d3 lavfi/hue: add an optimized direct path. 2013-03-10 02:13:02 +01:00
Michael Niedermayer
a05a44e205 Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 
* commit '7e350379f87e7f74420b4813170fe808e2313911':
  lavfi: switch to AVFrame.

Conflicts:
	doc/filters.texi
	libavfilter/af_ashowinfo.c
	libavfilter/audio.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/buffersink.c
	libavfilter/buffersrc.c
	libavfilter/buffersrc.h
	libavfilter/f_select.c
	libavfilter/f_setpts.c
	libavfilter/fifo.c
	libavfilter/split.c
	libavfilter/src_movie.c
	libavfilter/version.h
	libavfilter/vf_aspect.c
	libavfilter/vf_bbox.c
	libavfilter/vf_blackframe.c
	libavfilter/vf_delogo.c
	libavfilter/vf_drawbox.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_fieldorder.c
	libavfilter/vf_fps.c
	libavfilter/vf_frei0r.c
	libavfilter/vf_gradfun.c
	libavfilter/vf_hqdn3d.c
	libavfilter/vf_lut.c
	libavfilter/vf_overlay.c
	libavfilter/vf_pad.c
	libavfilter/vf_scale.c
	libavfilter/vf_showinfo.c
	libavfilter/vf_transpose.c
	libavfilter/vf_vflip.c
	libavfilter/vf_yadif.c
	libavfilter/video.c
	libavfilter/vsrc_testsrc.c
	libavfilter/yadif.h

Following are notes about the merge authorship and various technical details.

Michael Niedermayer:
  * Main merge operation, notably avfilter.c and video.c
  * Switch to AVFrame:
    - afade
    - anullsrc
    - apad
    - aresample
    - blackframe
    - deshake
    - idet
    - il
    - mandelbrot
    - mptestsrc
    - noise
    - setfield
    - smartblur
    - tinterlace
  * various merge changes and fixes in:
    - ashowinfo
    - blackdetect
    - field
    - fps
    - select
    - testsrc
    - yadif

Nicolas George:
  * Switch to AVFrame:
    - make rawdec work with refcounted frames. Adapted from commit
      759001c534 by Anton Khirnov.
      Also, fix the use of || instead of | in a flags check.
    - make buffer sink and src, audio and video work all together

Clément Bœsch:
  * Switch to AVFrame:
    - aevalsrc
    - alphaextract
    - blend
    - cellauto
    - colormatrix
    - concat
    - earwax
    - ebur128
    - edgedetect
    - geq
    - histeq
    - histogram
    - hue
    - kerndeint
    - life
    - movie
    - mp (with the help of Michael)
    - overlay
    - pad
    - pan
    - pp
    - pp
    - removelogo
    - sendcmd
    - showspectrum
    - showwaves
    - silencedetect
    - stereo3d
    - subtitles
    - super2xsai
    - swapuv
    - thumbnail
    - tile

Hendrik Leppkes:
  * Switch to AVFrame:
    - aconvert
    - amerge
    - asetnsamples
    - atempo
    - biquads

Matthieu Bouron:
  * Switch to AVFrame
    - alphamerge
    - decimate
    - volumedetect

Stefano Sabatini:
  * Switch to AVFrame:
    - astreamsync
    - flite
    - framestep

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-10 01:40:35 +01:00
Clément Bœsch
ee0a8bcba1 lavfi/showspectrum: fix outpicref initialization. 
In 81f2549, output pixel format was changed from rgb24 to planar yuv,
but the initialization was left unchanged. As a result, the chroma
planes were left uninitalized. This was not noticed since the current
ff_get_video_buffer() seems to be initializing the buffer. This won't be
the case anymore after the Evil Plan.
 2013-03-09 23:52:33 +01:00
Michael Niedermayer
6c17ff84ad Merge commit 'efa7f4202088c70caba11d7834641bc6eaf41830' 
* commit 'efa7f4202088c70caba11d7834641bc6eaf41830':
  Use the avstring.h locale-independent character type functions
  avstring: Add locale independent versions of some ctype.h functions

Conflicts:
	avprobe.c
	doc/APIchanges
	libavcodec/dvdsubdec.c
	libavcodec/utils.c
	libavutil/avstring.c
	libavutil/avstring.h
	libavutil/eval.c
	libavutil/parseutils.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-08 14:57:41 +01:00
Anton Khirnov
0651e892e1 Replace remaining includes of audioconvert.h with channel_layout.h 2013-03-08 07:42:13 +01:00
Anton Khirnov
d8b31be6ca Add the bumps and APIchanges entries for reference counted buffers changes. 2013-03-08 07:41:49 +01:00
Anton Khirnov
7e350379f8 lavfi: switch to AVFrame. 
Deprecate AVFilterBuffer/AVFilterBufferRef and everything related to it
and use AVFrame instead.
 2013-03-08 07:37:18 +01:00
Reimar Döffinger
efa7f42020 Use the avstring.h locale-independent character type functions 
Make sure the behavior does not change with the locale.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-03-07 15:16:36 +02:00
Michael Niedermayer
4c56b79a16 vf_stereo3d: Add AVOption table terminator 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-05 22:29:57 +01:00
Clément Bœsch
34d0ea5247 lavfi/deshake: support named options. 2013-03-05 21:16:54 +01:00
Stefano Sabatini
8d9509377e lavfi/overlay: improve log message warning in case of clipped overlay 2013-03-05 20:09:50 +01:00
Stefano Sabatini
f164228fd7 lavfi/overlay: add support for partial overlaying 
Partially rework the iteration logic, in order to limit iteration only
for the clipped overlay region.
 2013-03-05 20:09:21 +01:00
Paul B Mahol
1c808943b8 lavfi/mp: drop mp=stereo3d filter 
The filter has been natively integrated into libavfilter.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-03-05 18:45:35 +00:00
Paul B Mahol
3f35f36a2e lavfi: port MP stereo3d filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-03-05 18:36:40 +00:00
Clément Bœsch
14e240cb4a lavfi/opencv: isgraph -> av_isgraph. 
Fix build after 88d55b8.
 2013-03-03 22:06:48 +01:00
Reimar Döffinger
88d55b827d Remove incorrect use of ctype.h functions. 
As far as I can tell the code should not change behaviour
depending on locale in any of these places.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2013-03-03 21:44:10 +01:00
Nicolas George
3d2adeb6f8 lavfi/af_aresample: fix info log for unknown layouts. 2013-02-28 19:23:12 +01:00
Nicolas George
2bd104c72a lavfi/af_aresample: fix layout consistency check. 
If the channel layout is unknown, lswr will internally use
the default one for the corresponding number of channels.
 2013-02-28 19:23:12 +01:00
Michael Niedermayer
21c2e201f6 vf_lut: correct color/comp permutation 
Fixes Ticket2225

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-27 17:09:21 +01:00
Paul B Mahol
e0ccb5fa38 lavfi/hflip: support more formats 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-25 13:07:29 +00:00
Paul B Mahol
eac93932b0 lavfi/geq: improve support for formats with alpha plane 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-25 12:54:40 +00:00
Michael Niedermayer
bb7bc3443d af_biquads: memset(0) cache 
Fixes valgrind warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-25 04:39:26 +01:00
Stefano Sabatini
566560b85c lavfi/abuffersink: fix weird indent and spacing 2013-02-24 23:22:23 +01:00
Stefano Sabatini
b59cd089ff lavfi/abuffersink: add sample_rates field to AVABufferSinkParams 
Allow to select sample rates.
 2013-02-24 23:21:28 +01:00
Michael Niedermayer
c4c702b6d3 avfilter/avfiltergraph.h: Move public field out of the private fields 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-24 20:31:56 +01:00
Michael Niedermayer
71cf094e1b Merge commit '9f1223562e134bac6345a465870b9d56ff7d60cf' 
* commit '9f1223562e134bac6345a465870b9d56ff7d60cf':
  lavfi: connect libavresample options to af_resample via AVFilterGraph

Conflicts:
	doc/APIchanges
	libavfilter/avfiltergraph.c
	libavfilter/avfiltergraph.h
	libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-24 17:10:55 +01:00
Nicolas George
e568d432b1 lavfi/formats: reindent after last commit. 2013-02-24 12:05:06 +01:00
Nicolas George
2d98dd3d14 lavfi: fix merging of formats and clarify exception. 
The following commit:
b97d61f avfilter/ff_merge_formats: only merge if doing so does not loose chroma or alpha
introduced an exception to avoid lossy conversions.
Add a comment to explain the logic.
Fix the call to avoid applying it on audio formats.
 2013-02-24 11:58:52 +01:00
Nicolas George
bf0712c2f8 libavfilter/af_amerge: fix segfault if init fails. 2013-02-24 11:23:51 +01:00
Justin Ruggles
9f1223562e lavfi: connect libavresample options to af_resample via AVFilterGraph 2013-02-23 17:07:54 -05:00
Michael Niedermayer
73fce258b7 vf_mp: Set pseudo pal 
Fixes ticket2140
Fixes null pointer dereference

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-23 19:32:24 +01:00
Michael Niedermayer
cfcab4c507 vf_overlay: silence warning: X may be used uninitialized in this function 
Also ensure that format is valid in query_formats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-23 12:10:35 +01:00
Michael Niedermayer
3c14c82b7e avfilter: Silence warning: passing argument 3 of av_image_copy from incompatible pointer type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-23 12:08:05 +01:00
Stefano Sabatini
f30979e095 lavfi/boxblur: add support to named options 2013-02-22 19:57:20 +01:00
Paul B Mahol
47619e41c4 blend filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-21 20:16:23 +00:00
Nicolas George
01649c79c8 lavfi/buffersrc: set channel layout if it is known. 
If buffersrc was configured for frames with an unknown layout,
the incoming frames will have channel_layout = 0.
If the format negotiation has selected a known (and compatible)
channel layout for the link, the frame is assumed to have
that layout, the field must be set before injecting the frame
in the filters.
 2013-02-21 12:36:35 +01:00
Michael Niedermayer
cdb7a1ac63 vf_idet: adapt default scores due to bugfix 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-21 01:58:07 +01:00
Michael Niedermayer
dc9edb06b0 vf_idet: Fix macro arguments sideeffect 
Fixes valgrind errors
should improve detection scores

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-21 01:58:07 +01:00
Clément Bœsch
9b9d996b34 lavfi/subtitles: fix recently introduced warning about discarded const qualifier. 2013-02-20 19:47:32 +01:00
Stefano Sabatini
22b06103f0 lavfi/overlay: add format option 
In particular, fix misbehavior in case main and overlay input formats
mismatch (e.g. YUV420 and YUV444).
 2013-02-20 19:39:40 +01:00
Stefano Sabatini
2db0056f96 lavfi/overlay: apply minor consistency fixes 2013-02-20 19:18:17 +01:00
Stefano Sabatini
3d77a27548 lavfi/overlay: implement shortest option 
Force termination when the overlay stream ends. Simplify scripting logic,
for example when an infinite source is used to generate a background for
a composite video.
 2013-02-20 19:17:11 +01:00
Stefano Sabatini
a2a1e20fa2 lavfi/decimate: use named options 2013-02-20 19:07:48 +01:00
Michael Niedermayer
951d39fecd avfilter: fix segfault with setsar/dar 
Reported-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-20 12:34:05 +01:00
Stefano Sabatini
dd37326345 lavfi/hue: reindent after previous commit 2013-02-20 11:29:12 +01:00
Stefano Sabatini
d709a18ac2 lavfi/hue: simplify parsing by making use of option shorthands 2013-02-20 11:28:59 +01:00
Michael Niedermayer
b97d61f924 avfilter/ff_merge_formats: only merge if doing so does not loose chroma or alpha 
Fixes Ticket1280

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-19 15:00:01 +01:00
Paul B Mahol
f2d200d460 lavfi/overlay: yuv444p & yuva444p support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-19 11:11:42 +00:00
Paul B Mahol
480ddf2bc9 lavfi/histogram: overlay display mode for levels histogram mode 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-18 20:13:07 +00:00
Clément Bœsch
f894246304 lavf/showspectrum: add divVerent in the (c) for his recent work on the filter. 2013-02-18 13:34:37 +01:00
Paul B Mahol
f4e29c408c lavfi/noise: switch to AVLFG noise generator 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-17 21:45:21 +00:00
Clément Bœsch
f3147917bf lavf/subtitles: error out in case of bitmap subtitles. 2013-02-17 13:35:35 +01:00
Clément Bœsch
90fb3e9bee lavfi/subtitles: set a different description between ass and subtitles. 2013-02-17 12:58:20 +01:00
Clément Bœsch
2a14b23484 lavfi: rename vf_ass.c to vf_subtitles.c 2013-02-17 12:58:20 +01:00
Clément Bœsch
08d149d688 lavfi/subtitles: support charenc option. 2013-02-17 12:58:20 +01:00
Clément Bœsch
3a0a959dcb lavfi/subtitles: split options between ass and subtitles. 2013-02-17 12:58:20 +01:00
Stefano Sabatini
7ca2f8b113 lavfi/mp: drop mp=kerndeint filter 
The filter has been natively integrated into libavfilter.
 2013-02-17 11:48:45 +01:00
Stefano Sabatini
8c85a9f046 lavfi/mp: drop mp=unsharp filter 
The native filter is equivalent from the point of view of the features
and of performances.
 2013-02-17 11:48:37 +01:00
Stefano Sabatini
89505f2c3f lavfi/unsharp: add missing NULL check 2013-02-17 11:48:31 +01:00
Stefano Sabatini
64e592eef2 lavfi/unsharp: merge definition and declaration in init_filter_param() 2013-02-17 11:48:24 +01:00
Stefano Sabatini
d2cadea3f0 lavfi/unsharp: directly access in-loop variables in apply_unsharp() 
Increase performance, to match mp=unsharp.
 2013-02-17 11:48:12 +01:00
Stefano Sabatini
ef4c71e8f8 lavfi/unsharp: add check on matrix x/y size values oddity 2013-02-17 11:47:39 +01:00
Michael Niedermayer
b4bb996d6f yadif: remove unused variable 
Found by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-16 13:24:43 +01:00
Paul B Mahol
af882e1819 lavfi: port MP noise filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-16 11:42:41 +00:00
Michael Niedermayer
446f7c62a2 Merge commit '64ed397635ef2666b0ca0c8d8c60a8bc44581d82' 
* commit '64ed397635ef2666b0ca0c8d8c60a8bc44581d82':
  vf_yadif: fix out-of line reads

Conflicts:
	libavfilter/vf_yadif.c
	tests/ref/fate/filter-yadif-mode0
	tests/ref/fate/filter-yadif-mode1

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-16 09:09:38 +01:00
Michael Niedermayer
fab8a89abe Merge commit 'ccd70d9c1689990e5aef2de383199bbc7cf60d13' 
* commit 'ccd70d9c1689990e5aef2de383199bbc7cf60d13':
  vf_yadif: factorize initializing the filtering callbacks

Conflicts:
	libavfilter/vf_yadif.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-16 08:48:45 +01:00
James Darnley
87d359ff8f lavfi/yadif: support 9, 12, and 14 bits per pixel 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-16 00:32:02 +01:00
James Darnley
724061888b lavfi/yadif: remove unnecessary cast 
Finish what 99162f8 started

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-16 00:32:02 +01:00
Stefano Sabatini
f84ef19f3f lavfi/kerndeint: move is_rgb_packed definition to the internal context 
No need to recompute it for each new frame.
 2013-02-16 00:08:31 +01:00
Clément Bœsch
51ba843f19 lavfi/kerndeint: use aligned linesizes for the temporary buffer. 
This improves the performances just enough to match mp=kerndeint.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-02-16 00:08:31 +01:00
Stefano Sabatini
2042cd3769 lavfi/unsharp: extend range for amount values, to reflect the behavior of mp=unsharp 
Also update the documentation accordingly, and suggest a meaningful range.
 2013-02-16 00:08:31 +01:00
Stefano Sabatini
fbcc584d3a lavfi/unsharp: use named options, and add missing checks on matrix size values 
In particular, avoid out-of-buffer access and crashes with too big
values, and rework documentation accordingly.
 2013-02-16 00:08:31 +01:00
Hendrik Leppkes
5ad43af9a6 lavfi/kerndeint: use av_pix_fmt_desc_get instead of directly accessing the table 
Fixes FATE in MSVC DLL builds.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-15 19:07:37 +01:00
sedacca@comcast.net
b64de24fd7 lavfi/ebur128: advance pointer to samples 
Correct the advancement of a pointer to skip over LFE samples as
intended in the loudness computation.

This suggested patch is 3 of 3 for Ticket #2144 "libavfilter ebur128
loudness inaccuracy, irregular time interval, LFE interference".
This suggested patch supersedes the contribution of January 15, 2013
in the thread “[PATCH] lavfi: EBU R.128 irreg time, ch weights, skip
LFE” which combined multiple fixes in one batch.
 2013-02-15 16:39:25 +01:00
David A. Sedacca
de21e6736e lavfi/ebur128: fix channel weights 
Correct the recognition of channel layouts for good channel weight
in the loudness computation.
This suggested patch is 2 of 3 for Ticket #2144 "libavfilter ebur128
loudness inaccuracy, irregular time interval, LFE interference".

Signed-off-by: David A. Sedacca <sedacca at comcast.net>
 2013-02-15 16:38:58 +01:00
Anton Khirnov
64ed397635 vf_yadif: fix out-of line reads 
Some changes in the border pixels, visually indistinguishable.
 2013-02-15 16:08:33 +01:00
Anton Khirnov
ccd70d9c16 vf_yadif: factorize initializing the filtering callbacks 
Do it all in config_props().
 2013-02-15 16:08:00 +01:00
Stefano Sabatini
7ac3ccc5f2 lavfi/unsharp: use the same macros used in the original MP filter 
Remove possibly pointless inconsistency with the ported code.

Also specify parameter value ranges consistent with those of the ported
filter.
 2013-02-15 01:06:56 +01:00
Clément Bœsch
0224375180 lavfi/showspectrum: simplify intensity_color_table declaration. 2013-02-14 23:10:01 +01:00
Clément Bœsch
cf8dec7d64 lavfi/showspectrum: pretty-align constants. 
Binary object unchanged.
 2013-02-14 23:04:20 +01:00
Nicolas George
c557a5b08e lavfi/vf_ass: reindent after last commit. 2013-02-14 16:36:03 +01:00
Nicolas George
bb3303b94c lavfi/vf_ass: ignore subtitles decoding errors. 
A broken packet with invalid data in the middle of the stream
should not prevent from decoding the rest of the file.

Work around trac ticket #2264.
 2013-02-14 16:33:53 +01:00
Paul B Mahol
41ae43cade lavfi: remove softskip libmpcodecs wrapper 
It is supposed to be used with mencoder only and does
nothing when used with ffmpeg.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-14 12:51:56 +00:00
Paul B Mahol
968f8acec8 lavfi: remove dsize libmpcodecs wrapper 
Filter does nothing, and supposed funcionality
is already available with native filter(s).

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-14 12:51:56 +00:00
Paul B Mahol
34126cd090 lavfi/transpose: support more pix fmts 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-13 16:29:47 +00:00
Paul B Mahol
8160864b00 lavfi/amerge: make description consistent with documentation 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-11 14:43:23 +00:00
Stefano Sabatini
3acaea26e5 lavfi/il: filter out hwaccels formats from the list of supported formats 2013-02-10 21:00:56 +01:00
Stefano Sabatini
0b18965434 lavfi/il: move query_formats() definition up 
Respect order of call during the filter lifecycle, improve readability.
 2013-02-10 14:00:19 +01:00
Stefano Sabatini
63a9962287 lavfi/il: simplify/generalize linesize computation 
Rely on generic utilities for computing each plane linesize.

In particular, add support to NV12/21 formats and avoid use of
PIX_FMT_PLANAR pixdesc flag, whose semantics is questionable.

It also fixes various crashes.
 2013-02-10 14:00:19 +01:00
Paul B Mahol
969039eb6e lavfi/il: fix typo in Copyright 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-09 21:56:04 +00:00
Paul B Mahol
c0a8918f2a lavfi: remove mp=il filter 
Native il video filter is now available.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-09 21:43:39 +00:00
Paul B Mahol
6e9abce5e2 lavfi: port MP il filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-09 21:41:53 +00:00
Paul B Mahol
4fa9defc7f lavfi/histogram: make waveform mode more useful 
Now it displays all color components (not just luma)
either in parade or overlay and also works with RGB colorspace.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-09 16:05:28 +00:00
Paul B Mahol
e5670cb8a1 lavfi/histogram: make it C90 compliant 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-09 12:27:49 +00:00
Paul B Mahol
29a92c0114 histogram filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-09 11:45:56 +00:00
Stefano Sabatini
c0a4871c16 lavfi/select: correctly set prev_t and prev_pts 
In particular, fix trac ticket #2248.
 2013-02-07 21:28:46 +01:00
Stefano Sabatini
872855e2a5 lavfi/select: avoid double -> int lossy conversion in debug log 2013-02-07 21:00:54 +01:00
Michael Niedermayer
a00c4b4db0 af_biquad: avoid subtraction in loop 
17% faster
Note the speedup is smaller if its done before
storing in the context (gcc 4.6.3 core i7)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-07 19:46:02 +01:00
Michael Niedermayer
9f956611e3 af_biquad: unroll loop, remove variable copies 
This makes the code about 7% faster

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-07 19:03:22 +01:00
Nicolas George
b5884db437 lavfi: fix missing space in error message. 2013-02-07 12:22:09 +01:00
Nicolas George
3dea8b375e lavfi: remove disabled code. 2013-02-07 12:22:09 +01:00
Michael Niedermayer
6e9f3f3b65 Merge commit '238614de679a71970c20d7c3fee08a322967ec40' 
* commit '238614de679a71970c20d7c3fee08a322967ec40':
  cdgraphics: do not rely on get_buffer() initializing the frame.
  svq1: replace struct svq1_frame_size with an array.
  vf_yadif: silence a warning.

Conflicts:
	libavcodec/svq1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-06 14:53:49 +01:00
Anton Khirnov
99162f8d46 vf_yadif: silence a warning. 
clang says:
libavfilter/vf_yadif.c:192:28: warning: incompatible pointer types assigning to
'void (*)(uint8_t *, uint8_t *, uint8_t *, uint8_t *, int, int, int, int, int)'
from 'void (uint16_t *, uint16_t *, uint16_t *, uint16_t *, int, int, int, int, int)'
 2013-02-06 10:21:51 +01:00
Michael Niedermayer
2b20397e1f libmpcodecs/vd_ffmpeg.h: remove, its unused and removed upstream 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 15:54:39 +01:00
multiple authors
81e357db62 libmpcodecs/vf_pullup: update to latest version from mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 15:41:19 +01:00
multiple authors
13afcdd00e libmpcodecs/vf_uspp: update to latest version from mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 15:41:00 +01:00
multiple authors
3ce3d4cc3c libmpcodecs/vf_unsharp: update to latest version from mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 15:40:43 +01:00
multiple authors
7a4885600f libmpcodecs/vf_spp: update to latest version from mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 14:53:53 +01:00
multiple authors
14132599a3 libmpcodecs/vf_sab: update to latest version from mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 14:47:33 +01:00
multiple authors
fe8bc6ddfc libmpcodecs/pullup: update to latest version from mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 14:47:13 +01:00
multiple authors
8f7e3e678b libmpcodecs/vf_noise: update to latest version from mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 14:18:15 +01:00
multiple authors
3ca46d0c10 libmpcodecs/vf_pp7:update to latest version from mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 14:17:28 +01:00
multiple authors
fdd574ed3f libmpcodecs/vf_qp: update to latest version from mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 14:17:17 +01:00
multiple authors
b7e6622971 libmpcodecs/vf_mcdeint: update to latest version from mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 14:00:20 +01:00
multiple authors
25ed6e99d7 libmpcodecs/vf_ilpack: update to latest version from mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 13:59:47 +01:00
multiple authors
011702f5a9 libmpcodecs/vf_ivtc: update to latest version from mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 13:59:34 +01:00
multiple authors
0b36a05c17 libmpcodecs/vf_fspp: update to latest version from mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 13:44:53 +01:00
multiple authors
2b9eb6167b libmpcodecs/av_helpers: update to latest version from mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 13:43:35 +01:00
multiple authors
e02c713fb1 libmpcodecs/vf_filmdint: update to latest version from mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 13:40:08 +01:00
multiple authors
5d0115118d libmpcodecs/vf_divtc: update to latest version in mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 13:39:46 +01:00
multiple authors
99a0813a7e libhmpcodec/mp_msg: update to latest from mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 13:02:28 +01:00
multiple authors
745cb39d05 libmpcodecs/help_mp: update to latest from mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 12:58:20 +01:00
multiple authors
a54737f7ea libmpcodecs/cpudetect: update to latest from mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 12:55:10 +01:00
Michael Niedermayer
0b6f34cc9f Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avfilter: x86: consistent filenames for filter optimizations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 11:56:48 +01:00
multiple authors
103a2c2b17 libmpcodecs: update img_format.* & mp_image.* to latest from mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 03:30:17 +01:00
multiple authors
708ed15d8c libmpcodecs/vf_stereo3d: update to latest version from mplayer 
Merged commits:
commit 9a2978f37bcdf7a28235c9322e9e5a4fe15e2ff2
Author: cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date:   Thu Jan 31 12:12:36 2013 +0000

    Add more vf_stereo3d output formats.

    Adds high quality green-magenta and yellow-blue dubois
    anaglyph 3D output support.

    Patch by thomas schorpp, thomas.schorpp gmail

    git-svn-id: svn://svn.mplayerhq.hu:/mplayer/trunk@35906 b3059339-0415-0410-9bf9-f77b7e298cf2

commit 2c50e66460d8d3ec460cbf9425f252f75ea1022d
Author: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date:   Sun Aug 12 17:31:47 2012 +0000

    Add another anaglyph color variant.

    Patch by Bob [mpbob ezpi net].

    git-svn-id: svn://svn.mplayerhq.hu:/mplayer/trunk@35080 b3059339-0415-0410-9bf9-f77b7e298cf2

commit 71c5261c2ac63e6e29a5a899b52d1ec4bdb62c4e
Author: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date:   Sun Aug 12 17:25:30 2012 +0000

    Convert comments into designated initializers.

    That is a simple way to ensure they always correspond
    to what the compiler actually does.

    git-svn-id: svn://svn.mplayerhq.hu:/mplayer/trunk@35079 b3059339-0415-0410-9bf9-f77b7e298cf2

commit d7164c5e1ba524c2a6983d979ef57e193b2c8a9f
Author: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date:   Sun Aug 12 17:20:24 2012 +0000

    Make compiler give the ana_coeff array automatically the right size.
    Makes adding more colour schemes easier.

    git-svn-id: svn://svn.mplayerhq.hu:/mplayer/trunk@35078 b3059339-0415-0410-9bf9-f77b7e298cf2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 03:05:54 +01:00
Diego Biurrun
e66240f22e avfilter: x86: consistent filenames for filter optimizations 2013-02-04 15:00:47 +01:00
Rudolf Polzer
81f2549ec9 lavfi/showspectrum: display multiple channels in separate row 
The showspectrum filter gets multiple channel (any count) support.

Signed-off-by: Rudolf Polzer <divverent@xonotic.org>
 2013-02-04 13:37:43 +00:00
Rudolf Polzer
773fc6e0c7 lavfi/showspectrum: set default height to 512 
Only power-of-two FFTs are supported; so to get a full spectrum
(that is, one up to Nyquist), the height must be a power of two.

Therefore, change the default height from 480 to 512.

Signed-off-by: Rudolf Polzer <divverent@xonotic.org>
 2013-02-03 17:05:31 +00:00
Stefano Sabatini
1897109c00 lavfi/pad: add support to named options 2013-02-03 17:01:56 +01:00
Stefano Sabatini
fd6b6efbd2 lavfi/crop: fix help message for the keep_aspect option 2013-02-02 15:32:34 +01:00
Michael Niedermayer
6726fb6533 avfilter/vf_hqdn3d.h: restore author attribution, history and project name 
See git blame of pre split avfilter/vf_hqdn3d.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-02 13:18:10 +01:00
Michael Niedermayer
d593f2b241 avfilter/x86/vf_hqdn3d_init: fix author attribution & project name 
Reference: 7a1944b907

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-02 13:18:09 +01:00
Michael Niedermayer
0d13a7b786 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  vf_hqdn3d: x86: Add proper arch optimization initialization

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-02 13:18:01 +01:00
Diego Biurrun
76d90125cd vf_hqdn3d: x86: Add proper arch optimization initialization 2013-02-01 13:11:45 +01:00
Nicolas George
d2ccab5f8a lavfi/buffersrc: forward filter_frame errors. 
Note: The ret variable was unused.
 2013-01-31 21:03:54 +01:00
Nicolas George
dcce43340f lavfi/af_amerge: set outbuf->audio->channels. 
The value is lost because of avfilter_copy_buffer_ref_props().

Fix trac ticket #2217.
 2013-01-31 21:03:54 +01:00
Nicolas George
ae14887ee7 lavfi/af_amerge: check for buffer queue overflows. 
Without that test, ff_bufqueue_add silently discards the
oldest buffer, that leaves in[i].nb_samples inconsistent,
and causes later a segfault.
 2013-01-31 21:03:54 +01:00
Nicolas George
6560625f0a lavfi/bufferqueue: add ff_bufqueue_is_full(). 2013-01-31 21:03:54 +01:00
Stefano Sabatini
e47114d545 lavfi: increment max number of registered filters from 128 to 256 
The total number of implemented filters is already over 128.
 2013-01-31 16:47:37 +01:00
Paul B Mahol
402ea625ab lavfi/biquads: remove pointless casts 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-31 13:16:32 +00:00
Paul B Mahol
b70ea49ca3 Port biquads filters from SoX 
Adds allpass, bass, bandpass, bandreject, biquad,
equalizer, highpass, lowpass and treble filter.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-31 12:13:55 +00:00
Michael Niedermayer
5068bcda95 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  vf_delogo: fix copying the input frame.

Conflicts:
	libavfilter/vf_delogo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-29 14:58:49 +01:00
Anton Khirnov
7194330bcd vf_delogo: fix copying the input frame. 
CC:libav-stable@libav.org
 2013-01-29 07:33:02 +01:00
Anton Khirnov
f81c37e40f vf_delogo: fix an uninitialized read. 
CC:libav-stable@libav.org
 2013-01-29 07:32:54 +01:00
Michael Niedermayer
1336382c6d avfilter_get_audio_buffer_ref_from_frame: fix handling of >8 channels 
Found-by: inferno@chromium.org
Reported-by: Dale Curtis <dalecurtis@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-28 21:45:16 +01:00
Nicolas George
42c6f2a645 lavfi/vf_drawtext: default to expansion=normal. 2013-01-26 12:52:19 +01:00
Nicolas George
255ae9f380 lavfi: version bump and change log entries after the last commits. 2013-01-26 11:25:21 +01:00
Nicolas George
699b286a21 lavfi/af_anull: accept unknown channel layouts. 2013-01-26 11:15:38 +01:00
Nicolas George
b00502457a lavfi/af_aresample: accept unknown channel layouts. 2013-01-26 11:15:38 +01:00
Nicolas George
6d962aec8d lavfi/af_aformat: accept unknown channel layouts. 2013-01-26 11:15:38 +01:00
Nicolas George
ea645e90a1 lavfi/buffersrc: accept unknown channel layouts. 2013-01-26 11:15:38 +01:00
Nicolas George
19506af788 lavfi/sink_buffer: accept unknown channel layouts. 
Add a field to the AVBufferSinkParams for a list of accepted
channel counts.
Change the default value for the lists in AVBufferSinkParams
to NULL, to let lavfi fill them with something useful.
The fail_enomem path is unneeded because filters are uninited
on failure.
 2013-01-26 11:15:38 +01:00
Nicolas George
b6b2f3433c lavfi: implement ff_query_formats_all(). 2013-01-26 11:15:38 +01:00
Nicolas George
7bb98b753b lavfi: implement ff_all_channel_counts(). 2013-01-26 11:15:38 +01:00
Nicolas George
b6afb2dde1 lavfi: support unknown channel layouts. 2013-01-26 11:15:38 +01:00
Stefano Sabatini
e80be5a0aa lavfi/showwaves: fail in case of push_frame() error 2013-01-25 19:35:21 +01:00
Stefano Sabatini
b7d34b328b lavfi/showwaves: add display mode option and mode=line 2013-01-25 17:42:04 +01:00
Michael Niedermayer
fc2922836b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avfilter: allow setpts filter to use wallclock time for calculations

Conflicts:
	doc/filters.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-25 15:04:41 +01:00
Vladimir Pantelic
0b55b16abc avfilter: allow setpts filter to use wallclock time for calculations 
Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-01-25 10:50:09 +01:00
Paul B Mahol
e65046bf83 lavfi/earwax: remove config_input() 
This is wrong function to check for input parameters.
Function is not needed because query_formats() already
sets supported sample rates.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-24 10:37:44 +00:00
Michael Niedermayer
ac8987591f Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f' 
* commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f':
  Drop DCTELEM typedef

Conflicts:
	libavcodec/alpha/dsputil_alpha.h
	libavcodec/alpha/motion_est_alpha.c
	libavcodec/arm/dsputil_init_armv6.c
	libavcodec/bfin/dsputil_bfin.h
	libavcodec/bfin/pixels_bfin.S
	libavcodec/cavs.c
	libavcodec/cavsdec.c
	libavcodec/dct-test.c
	libavcodec/dnxhdenc.c
	libavcodec/dsputil.c
	libavcodec/dsputil.h
	libavcodec/dsputil_template.c
	libavcodec/eamad.c
	libavcodec/h264_cavlc.c
	libavcodec/h264idct_template.c
	libavcodec/mpeg12.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo.h
	libavcodec/mpegvideo_enc.c
	libavcodec/ppc/dsputil_altivec.c
	libavcodec/proresdsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-23 17:44:56 +01:00
Paul B Mahol
a793a587df lavfi/swapuv: support all planar yuv pixel formats 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-23 16:13:23 +00:00
Stefano Sabatini
5b10c5e7e4 lavfi/showwaves: fix check on showwaves->outpicref 
outpicref is not always in synch with showwaves->outpicref, which is
changed as a side effect of the call to functions.

Fix regression introduced in 5f634480d1,
+10l to me.
 2013-01-22 20:34:29 +01:00
Michael Niedermayer
e4eebc2da9 avf_showwaves: fix null pointer dereference 
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-21 23:00:20 +01:00
Paul B Mahol
6ea8a830e8 afade filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-21 15:20:42 +00:00