virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity
66,757 Commits 37 Branches 400 Tags 467 MiB
0c06949314
Commit Graph

99 Commits

Author SHA1 Message Date
Michael Niedermayer
0daff3ce76 avfilter/vf_mp: remove incorrect usage of AVFrame.type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-30 12:16:46 +02:00
Lou Logan
88f2586adb fix various typos 
Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-03 10:58:19 -08:00
Vallimar
6f5c36832d avfilter/vf_mp: fix missing FF_API_XVMC check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-18 01:22:30 +01:00
Michael Niedermayer
325f6e0a97 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavfi: do not export the filters from shared objects

Conflicts:
	libavfilter/af_amix.c
	libavfilter/af_anull.c
	libavfilter/asrc_anullsrc.c
	libavfilter/f_select.c
	libavfilter/f_settb.c
	libavfilter/split.c
	libavfilter/src_movie.c
	libavfilter/vf_aspect.c
	libavfilter/vf_blackframe.c
	libavfilter/vf_colorbalance.c
	libavfilter/vf_copy.c
	libavfilter/vf_crop.c
	libavfilter/vf_cropdetect.c
	libavfilter/vf_drawbox.c
	libavfilter/vf_format.c
	libavfilter/vf_framestep.c
	libavfilter/vf_frei0r.c
	libavfilter/vf_hflip.c
	libavfilter/vf_libopencv.c
	libavfilter/vf_lut.c
	libavfilter/vf_null.c
	libavfilter/vf_overlay.c
	libavfilter/vf_scale.c
	libavfilter/vf_transpose.c
	libavfilter/vf_unsharp.c
	libavfilter/vf_vflip.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-29 11:58:11 +01:00
Paul B Mahol
390c35a13b lavfi/mp: remove mp=qp 
The filter does nothing.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-19 15:53:45 +00:00
Paul B Mahol
8302abf844 lavfi/mp: remove mp=pullup 
The filter was ported to a native libavfilter filter.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-18 11:05:27 +00:00
Paul B Mahol
7ac6c6325e libavfilter/libmpcodecs: remove unused files 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-15 21:43:04 +00:00
Paul B Mahol
b211607b5c avfilter: various cosmetics 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-12 14:01:43 +00:00
Paul B Mahol
d2e237338d lavfi/mp: remove mp=fil 
The filter does not work correctly most of time.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-05 20:22:47 +00:00
Paul B Mahol
0a8bb91505 lavfi/mp: remove mp=dint 
There are better and actually maintained filters that have similar
functionality.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-05 20:03:36 +00:00
Paul B Mahol
916549cb1e lavfi/mp: remove mp=phase 
The filter was ported to a native libavfilter filter.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-03 14:05:38 +00:00
Michael Niedermayer
cbdf4d6a61 avfilter/vf_mp: remove unused sws related functions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-16 16:07:29 +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
Michael Niedermayer
ef90639004 avfilter/vf_mp: preserve pixel format when possible 
Fixes Ticket2577

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-28 03:32:00 +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
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
ec34963276 lavfi/mp: drop mcdeint wrapper 
It was ported to a native libavfilter filter.
 2013-06-01 22:35:20 +02:00
Paul B Mahol
1f02927d28 lavfi/mp: try to pass interlaced & tff flags 
This makes mp=softpulldown actually useful.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-22 20:30:09 +00:00
Clément Bœsch
d686517ad1 lavfi/mp: remove mp=ow wrapper. 
Filter ported natively as owdenoise.
 2013-05-16 00:45:45 +02:00
Michael Niedermayer
bb0d3a4393 avfilter/vf_mp: remove unused function 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-11 19:08:42 +02:00
Stefano Sabatini
0400176772 lavfi/mp: remove mp=tinterlace wrapper 
From various tests, there is no evidence that the filter is faster than
the native tinterlace, and it has several more limitations and a few
bugs.

See thread:
Subject: [FFmpeg-devel] [NOPATCH] lavfi/mp: drop tinterlace wrapper
Date: Wed, 5 Sep 2012 00:26:01 +0200
 2013-04-28 13:16:40 +02:00
Paul B Mahol
2f11aa141a lavfi: remove mp=down3dright 
Same funcionality is provided by stereo3d=ab[2]{l,r}:sbs[2]{l,r}.
Additional "features" are barely useful and cause crash or artifacts.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-22 11:49:13 +00:00
Paul B Mahol
f0a149e538 lavfi: remove bad inverse telecine filters 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-17 11:51:16 +00:00
Michael Niedermayer
9b672d4017 vf_mp: mp buffers are not compatible with the reference count system 
We thus must copy each frame on the vf_mp output.

This fixes artifacts with "ffplay -threads 1 dnxhdconv.mov -vf mp=eq2=1:1"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-13 15:02:51 +02:00
Michael Niedermayer
fd6228e657 lavfi: remove now unused args parameter from AVFilter.init and init_opaque 
This is mostly automated global search and replace

The deprecated aconvert filter is disabled, if it still has users
it should be updated

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-12 11:54:39 +02:00
Clément Bœsch
838d803155 lavfi/mp: switch to an AVOptions-based system. 2013-04-11 23:27:12 +02:00
Paul B Mahol
32a7b858c9 lavfi: remove telecine libmpcodecs wrapper 
Native, with more features, filter is available.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-11 11:22:11 +00:00
Paul B Mahol
9dc88ac367 lavfi: remove noise libmpcodecs wrapper 
Native filter have reached similar performance.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-08 20:57:59 +00:00
Michael Niedermayer
21f4fc2e40 avfilter/vf_mp: fix x86 cpu caps 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-06 18:23:59 +02:00
Paul B Mahol
17c1881d58 lavfi: remove harddup 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-03-19 17:15:53 +00: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
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
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
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
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
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
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
Michael Niedermayer
458afd2a0e vf_mp: fix 'discards const qualifier from pointer target type' 
args are not supposed to be changed by filters even if the argument is
not marked as const.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-28 17:00:01 +01:00
Clément Bœsch
768c47ec37 lavfi: remove mp=pp filter. 
Native pp filter is available.

postproc dependency is also dropped from mp wrapper since it was the
only filter needing that dependency.
 2012-12-23 19:03:36 +01:00
Clément Bœsch
fd3cdcaf5f lavfi: remove mp=denoise3d filter. 
hqdn3d was meant to be a more efficient denoise3d filter, is supported
natively, and is faster on my computer thanks to the ASM optimisations.
 2012-12-11 04:28:08 +01:00
Clément Bœsch
bbd44f6ca4 lavfi/mp: switch to ff_filter_frame. 2012-12-06 21:11:28 +01:00
Clément Bœsch
1e85fd6a47 lavfi/mp: remove dead extern vf_info_t declarations. 2012-12-06 12:52:58 +01:00
anonymous
de42d2a347 lavfi/mp: add ff_ prefix to exported symbols 2012-12-06 12:38:37 +01:00
Michael Niedermayer
99efd59626 Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967' 
* commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967':
  Remove pointless #undefs of previously forbidden functions.
  fate: Add dependencies for bmp, cdxl, dfa, mp3

Conflicts:
	doc/examples/muxing.c
	libavfilter/filtfmts.c
	libavutil/des.c
	libavutil/eval.c
	libavutil/log.c
	libavutil/parseutils.c
	tests/fate/mp3.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-05 13:34:45 +01:00
Clément Bœsch
359cd12a43 lavfi/mp: fix invalid read with filters with no argument. 2012-12-04 03:47:16 +01:00
Clément Bœsch
2d9d444051 lavfi: convert remaining input/output list compound literals to named objects. 
This is following 568c70e79e.
 2012-11-28 23:19:20 +01:00
Clément Bœsch
3a7f00810c lavfi: remove mp=geq filter. 
Native geq video filter is now available.
 2012-11-11 23:18:12 +01:00
Clément Bœsch
2b3597f0d1 lavfi: remove mp=fixpts filter. 
lavfi/f_setpts.c should allow everything mp=fixpts supports, with a lot
of additional control.
 2012-11-11 22:49:53 +01:00