ffmpeg.git
6 years agoFix compilation with --disable-everything --enable-filter=deshake
James Almer [Wed, 10 Apr 2013 08:33:12 +0000 (05:33 -0300)]
Fix compilation with --disable-everything --enable-filter=deshake

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/avisynth: Don't insert null frames or samples at the start of a stream.
Stephen Hutchinson [Wed, 10 Apr 2013 19:29:27 +0000 (15:29 -0400)]
avformat/avisynth: Don't insert null frames or samples at the start of a stream.

This is the last remaining issue from ticket #2412

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibshine fixed point MP3 encoding support
Paul B Mahol [Sun, 29 Jul 2012 18:20:00 +0000 (18:20 +0000)]
libshine fixed point MP3 encoding support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agocmdutils_common_opts: fix indention of #if
Michael Niedermayer [Thu, 11 Apr 2013 14:07:46 +0000 (16:07 +0200)]
cmdutils_common_opts: fix indention of #if

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocmdutils: remove unneeded #if
Michael Niedermayer [Thu, 11 Apr 2013 14:07:11 +0000 (16:07 +0200)]
cmdutils: remove unneeded #if

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocmdutils: add opencl command line options to ffmpeg
highgod0401 [Thu, 11 Apr 2013 12:16:29 +0000 (20:16 +0800)]
cmdutils: add opencl command line options to ffmpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/bbox: remove unused variables and functions
Paul B Mahol [Thu, 11 Apr 2013 14:00:43 +0000 (14:00 +0000)]
lavfi/bbox: remove unused variables and functions

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 11 Apr 2013 13:56:18 +0000 (15:56 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Move misplaced file author information where it belongs

Conflicts:
libavcodec/adpcm.c
libavcodec/adpcmenc.c
libavcodec/gif.c
libavcodec/x86/dsputilenc_mmx.c
libavcodec/x86/fmtconvert_init.c
libavformat/au.c
libavformat/gif.c
libavformat/mov.c
libavformat/nsvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi: add pp to the ':'-to-'|' compat layer.
Clément Bœsch [Thu, 11 Apr 2013 13:52:40 +0000 (15:52 +0200)]
lavfi: add pp to the ':'-to-'|' compat layer.

6 years agoMerge commit '9de9b828ef005dec37052548c195a6b4f18fc701'
Michael Niedermayer [Thu, 11 Apr 2013 13:42:32 +0000 (15:42 +0200)]
Merge commit '9de9b828ef005dec37052548c195a6b4f18fc701'

* commit '9de9b828ef005dec37052548c195a6b4f18fc701':
  lavc: don't overwrite display dimensions with coded dimensions.
  lavc: extend / update the [coded_]{width,height} doxy

Conflicts:
libavcodec/avcodec.h
libavcodec/utils.c

The change to the w/h handling is not merged as it breaks lowres

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/asetnsamples: switch to an AVOptions-based system.
Clément Bœsch [Thu, 11 Apr 2013 13:38:49 +0000 (15:38 +0200)]
lavfi/asetnsamples: switch to an AVOptions-based system.

6 years agolavfi/anullsrc: switch to an AVOptions-based system.
Clément Bœsch [Thu, 11 Apr 2013 13:21:40 +0000 (15:21 +0200)]
lavfi/anullsrc: switch to an AVOptions-based system.

6 years agolavfi: remove bbox from the filters left to update.
Clément Bœsch [Thu, 11 Apr 2013 13:13:49 +0000 (15:13 +0200)]
lavfi: remove bbox from the filters left to update.

The filter doesn't take any option and thus works with the new system.

6 years agolavfi/blend: support more yuv pixel formats
Paul B Mahol [Thu, 11 Apr 2013 12:37:36 +0000 (12:37 +0000)]
lavfi/blend: support more yuv pixel formats

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/astreamsync: switch to an AVOptions-based system.
Clément Bœsch [Thu, 11 Apr 2013 12:58:29 +0000 (14:58 +0200)]
lavfi/astreamsync: switch to an AVOptions-based system.

6 years agolavfi/astreamsync: fix eval memleak.
Clément Bœsch [Thu, 11 Apr 2013 12:58:13 +0000 (14:58 +0200)]
lavfi/astreamsync: fix eval memleak.

6 years agoMerge commit '20429ba96e55db17ac57f6c0e330914287f1f614'
Michael Niedermayer [Thu, 11 Apr 2013 12:48:21 +0000 (14:48 +0200)]
Merge commit '20429ba96e55db17ac57f6c0e330914287f1f614'

* commit '20429ba96e55db17ac57f6c0e330914287f1f614':
  h261: Move encoder/decoder shared table init to common code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/blackdetect: switch to an AVOptions-based system.
Clément Bœsch [Thu, 11 Apr 2013 12:48:19 +0000 (14:48 +0200)]
lavfi/blackdetect: switch to an AVOptions-based system.

6 years agolavfi/sendcmd: switch to an AVOptions-based system.
Clément Bœsch [Thu, 11 Apr 2013 12:39:37 +0000 (14:39 +0200)]
lavfi/sendcmd: switch to an AVOptions-based system.

6 years agolavfi/testsrc: remove useless args/NULL passing.
Clément Bœsch [Thu, 11 Apr 2013 12:35:02 +0000 (14:35 +0200)]
lavfi/testsrc: remove useless args/NULL passing.

6 years agoavfilter: add missing ,
Michael Niedermayer [Thu, 11 Apr 2013 12:27:09 +0000 (14:27 +0200)]
avfilter: add missing ,

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '8a776ad90e00ab2b98e8683ac6182d641a383c3a'
Michael Niedermayer [Thu, 11 Apr 2013 12:25:38 +0000 (14:25 +0200)]
Merge commit '8a776ad90e00ab2b98e8683ac6182d641a383c3a'

* commit '8a776ad90e00ab2b98e8683ac6182d641a383c3a':
  h261: Move shared data tables from a header to a proper C file

Conflicts:
libavcodec/Makefile
libavcodec/h261data.c
libavcodec/h261dec.c
libavcodec/h261enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/smptebars: switch to AVOptions-based system
Paul B Mahol [Thu, 11 Apr 2013 12:21:27 +0000 (12:21 +0000)]
lavfi/smptebars: switch to AVOptions-based system

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/showwaves: switch to an AVOptions-based system.
Clément Bœsch [Thu, 11 Apr 2013 12:17:20 +0000 (14:17 +0200)]
lavfi/showwaves: switch to an AVOptions-based system.

6 years agolavfi: replace new filter list with filters left to update.
Clément Bœsch [Thu, 11 Apr 2013 11:39:38 +0000 (13:39 +0200)]
lavfi: replace new filter list with filters left to update.

6 years agoMAINTAINERS: add opencl maintainer
highgod0401 [Thu, 11 Apr 2013 11:31:54 +0000 (19:31 +0800)]
MAINTAINERS: add opencl maintainer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomxfdec: update current edit unit when seeking in mxf files without index tables
Marton Balint [Wed, 10 Apr 2013 23:09:40 +0000 (01:09 +0200)]
mxfdec: update current edit unit when seeking in mxf files without index tables

Fixes audio packet pts values in some files generated by AVID TRMG 3.01.

Signed-off-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cigaes/master'
Michael Niedermayer [Thu, 11 Apr 2013 11:28:19 +0000 (13:28 +0200)]
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  fate: add tests for unknown channel layouts.
  lavfi/buffersrc: update for compatibility with the fork.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi: remove telecine libmpcodecs wrapper
Paul B Mahol [Sat, 6 Apr 2013 15:23:12 +0000 (15:23 +0000)]
lavfi: remove telecine libmpcodecs wrapper

Native, with more features, filter is available.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi: remove double .priv_class initializers
Paul B Mahol [Thu, 11 Apr 2013 11:11:12 +0000 (11:11 +0000)]
lavfi: remove double .priv_class initializers

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agotelecine filter
Paul B Mahol [Sat, 6 Apr 2013 13:45:52 +0000 (13:45 +0000)]
telecine filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agofate: add tests for unknown channel layouts.
Nicolas George [Mon, 1 Apr 2013 13:42:59 +0000 (15:42 +0200)]
fate: add tests for unknown channel layouts.

6 years agolavfi/buffersrc: update for compatibility with the fork.
Nicolas George [Wed, 10 Apr 2013 13:58:52 +0000 (15:58 +0200)]
lavfi/buffersrc: update for compatibility with the fork.

Merge and adapt commit d28cb84 by Anton Khirnov.

6 years agolavfi/curves: introduce "all" field in presets and use it.
Clément Bœsch [Thu, 11 Apr 2013 11:03:25 +0000 (13:03 +0200)]
lavfi/curves: introduce "all" field in presets and use it.

6 years agolavfi/curves: make possible to customize presets.
Clément Bœsch [Thu, 11 Apr 2013 10:47:42 +0000 (12:47 +0200)]
lavfi/curves: make possible to customize presets.

6 years agolavfi/curves: fix a spacing weirdness.
Clément Bœsch [Thu, 11 Apr 2013 10:42:18 +0000 (12:42 +0200)]
lavfi/curves: fix a spacing weirdness.

6 years agodoc/opencl: speling and gramer fixes
Michael Niedermayer [Thu, 11 Apr 2013 10:59:22 +0000 (12:59 +0200)]
doc/opencl: speling and gramer fixes

Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoopencl: add spec opencl device APIs 20130411
highgod0401 [Thu, 11 Apr 2013 04:57:52 +0000 (12:57 +0800)]
opencl: add spec opencl device APIs 20130411

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/smartblur: cleanup unused shorthand and doc.
Clément Bœsch [Thu, 11 Apr 2013 10:01:27 +0000 (12:01 +0200)]
lavfi/smartblur: cleanup unused shorthand and doc.

6 years agolavfi/overlay: cleanup unused shorthand.
Clément Bœsch [Thu, 11 Apr 2013 09:59:06 +0000 (11:59 +0200)]
lavfi/overlay: cleanup unused shorthand.

6 years agolavfi/field: cleanup unused shorthand and doc.
Clément Bœsch [Thu, 11 Apr 2013 09:58:07 +0000 (11:58 +0200)]
lavfi/field: cleanup unused shorthand and doc.

6 years agomss4: make code independent of sizeof(AVFrame)
Paul B Mahol [Thu, 11 Apr 2013 10:37:36 +0000 (10:37 +0000)]
mss4: make code independent of sizeof(AVFrame)

Also fixes #2455.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agomss4: use init_get_bits8()
Paul B Mahol [Thu, 11 Apr 2013 10:06:01 +0000 (10:06 +0000)]
mss4: use init_get_bits8()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 11 Apr 2013 10:30:39 +0000 (12:30 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dsputil: Make dsputil selectable

Conflicts:
configure
libavcodec/Makefile
libavcodec/x86/Makefile
libavcodec/x86/constants.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_mmx.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '85deb51a01f1ecc5ac5faa52ad8ea141c384e23a'
Michael Niedermayer [Thu, 11 Apr 2013 10:00:05 +0000 (12:00 +0200)]
Merge commit '85deb51a01f1ecc5ac5faa52ad8ea141c384e23a'

* commit '85deb51a01f1ecc5ac5faa52ad8ea141c384e23a':
  h264: Only initialize dsputil if error resilience is enabled

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'ubitux/shorthand-cleanup'
Michael Niedermayer [Thu, 11 Apr 2013 09:54:05 +0000 (11:54 +0200)]
Merge remote-tracking branch 'ubitux/shorthand-cleanup'

* ubitux/shorthand-cleanup:
  lavfi/setfield: switch to an AVOptions-based system.
  lavfi/asettb: switch to an AVOptions-based system.
  lavfi/aselect: switch to an AVOptions-based system.
  lavfi/sine: switch to an AVOptions-based system.
  lavfi/deshake: switch to an AVOptions-based system.
  lavfi/tinterlace: switch to an AVOptions-based system.
  lavfi/tile: switch to an AVOptions-based system.
  lavfi/concat: switch to an AVOptions-based system.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/setfield: switch to an AVOptions-based system.
Clément Bœsch [Thu, 11 Apr 2013 09:50:56 +0000 (11:50 +0200)]
lavfi/setfield: switch to an AVOptions-based system.

6 years agolavfi/asettb: switch to an AVOptions-based system.
Clément Bœsch [Thu, 11 Apr 2013 09:48:42 +0000 (11:48 +0200)]
lavfi/asettb: switch to an AVOptions-based system.

6 years agoMerge commit '62844c3fd66940c7747e9b2bb7804e265319f43f'
Michael Niedermayer [Thu, 11 Apr 2013 09:53:19 +0000 (11:53 +0200)]
Merge commit '62844c3fd66940c7747e9b2bb7804e265319f43f'

* commit '62844c3fd66940c7747e9b2bb7804e265319f43f':
  h264: Integrate clear_blocks calls with IDCT

Conflicts:
libavcodec/arm/h264idct_neon.S
libavcodec/h264idct_template.c
libavcodec/x86/h264_idct.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/aselect: switch to an AVOptions-based system.
Clément Bœsch [Thu, 11 Apr 2013 09:45:25 +0000 (11:45 +0200)]
lavfi/aselect: switch to an AVOptions-based system.

6 years agolavfi/sine: switch to an AVOptions-based system.
Clément Bœsch [Thu, 11 Apr 2013 09:42:19 +0000 (11:42 +0200)]
lavfi/sine: switch to an AVOptions-based system.

6 years agolavfi/deshake: switch to an AVOptions-based system.
Clément Bœsch [Thu, 11 Apr 2013 09:39:24 +0000 (11:39 +0200)]
lavfi/deshake: switch to an AVOptions-based system.

6 years agolavfi/tinterlace: switch to an AVOptions-based system.
Clément Bœsch [Thu, 11 Apr 2013 09:35:01 +0000 (11:35 +0200)]
lavfi/tinterlace: switch to an AVOptions-based system.

6 years agolavfi/tile: switch to an AVOptions-based system.
Clément Bœsch [Wed, 10 Apr 2013 21:15:06 +0000 (23:15 +0200)]
lavfi/tile: switch to an AVOptions-based system.

6 years agolavfi/concat: switch to an AVOptions-based system.
Clément Bœsch [Wed, 10 Apr 2013 23:10:40 +0000 (01:10 +0200)]
lavfi/concat: switch to an AVOptions-based system.

6 years agoMerge commit 'e8cafd2773bc56455c8816593cbd9368f2d69a80'
Michael Niedermayer [Thu, 11 Apr 2013 09:40:05 +0000 (11:40 +0200)]
Merge commit 'e8cafd2773bc56455c8816593cbd9368f2d69a80'

* commit 'e8cafd2773bc56455c8816593cbd9368f2d69a80':
  h264: Clear the mb members via memset instead of using dsputil

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '6d25c9db11e87ec58652de6588448225137b0c57'
Michael Niedermayer [Thu, 11 Apr 2013 09:26:43 +0000 (11:26 +0200)]
Merge commit '6d25c9db11e87ec58652de6588448225137b0c57'

* commit '6d25c9db11e87ec58652de6588448225137b0c57':
  dsputil: Make square put/avg_pixels functions local to h264qpel

Conflicts:
libavcodec/dsputil.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2e81acc687e64d15dd93c74793060bb5a233f44d'
Michael Niedermayer [Thu, 11 Apr 2013 09:20:55 +0000 (11:20 +0200)]
Merge commit '2e81acc687e64d15dd93c74793060bb5a233f44d'

* commit '2e81acc687e64d15dd93c74793060bb5a233f44d':
  x86inc: Fix number of operands for cmp* instructions
  af_channelmap: fix uninitialized variable use introduced in ba8efac977f4276f05274947b2b67d144cbc965a
  lavfi: add a bump and docs entries for the AVOptions switch

Conflicts:
Changelog
doc/APIchanges
libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'ubitux/lavfi-mixed-short-long'
Michael Niedermayer [Thu, 11 Apr 2013 09:09:44 +0000 (11:09 +0200)]
Merge remote-tracking branch 'ubitux/lavfi-mixed-short-long'

* ubitux/lavfi-mixed-short-long:
  lavfi: restore mixed short/long option support with the new system.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '8114c101607843a86960bd3e0e9c40487dc2a961'
Michael Niedermayer [Thu, 11 Apr 2013 08:59:06 +0000 (10:59 +0200)]
Merge commit '8114c101607843a86960bd3e0e9c40487dc2a961'

* commit '8114c101607843a86960bd3e0e9c40487dc2a961':
  lavfi: add avfilter_get_class().

Conflicts:
libavfilter/avfilter.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi: restore mixed short/long option support with the new system.
Clément Bœsch [Thu, 11 Apr 2013 08:38:05 +0000 (10:38 +0200)]
lavfi: restore mixed short/long option support with the new system.

process_unnamed_options() is renamed to process_options() and its code
is heavily based on av_opt_set_from_string().

6 years agoMerge commit '4d1f31ea44f82adfb2b712534d71e27233a4f785'
Michael Niedermayer [Thu, 11 Apr 2013 08:42:49 +0000 (10:42 +0200)]
Merge commit '4d1f31ea44f82adfb2b712534d71e27233a4f785'

* commit '4d1f31ea44f82adfb2b712534d71e27233a4f785':
  lavfi: make AVFilterContext export filter options.

Conflicts:
libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '62549f9655c48f0ec061087fa33a96040ce01145'
Michael Niedermayer [Thu, 11 Apr 2013 08:34:05 +0000 (10:34 +0200)]
Merge commit '62549f9655c48f0ec061087fa33a96040ce01145'

* commit '62549f9655c48f0ec061087fa33a96040ce01145':
  lavfi: error out when options are provided to a filter that does not take any

Conflicts:
libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c43a7ecad997fc527af34b952334f3d030709a1b'
Michael Niedermayer [Thu, 11 Apr 2013 08:25:42 +0000 (10:25 +0200)]
Merge commit 'c43a7ecad997fc527af34b952334f3d030709a1b'

* commit 'c43a7ecad997fc527af34b952334f3d030709a1b':
  lavfi: remove now unused args parameter from AVFilter.init

Conflicts:
libavfilter/avfilter.c
libavfilter/buffersrc.c
libavfilter/f_select.c
libavfilter/src_movie.c
libavfilter/vf_alphamerge.c
libavfilter/vf_drawtext.c
libavfilter/vf_lut.c

Not merged (yet) because there are still many filters that use the args
parameter.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '7b3eb745b98b04dd8a4970b9fd6c98998e858fc1'
Michael Niedermayer [Thu, 11 Apr 2013 08:02:07 +0000 (10:02 +0200)]
Merge commit '7b3eb745b98b04dd8a4970b9fd6c98998e858fc1'

* commit '7b3eb745b98b04dd8a4970b9fd6c98998e858fc1':
  vsrc_testsrc: switch to an AVOptions-based system.

Conflicts:
doc/filters.texi
libavfilter/vsrc_testsrc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/opencl: add opencl device list APIs 20130411
highgod0401 [Thu, 11 Apr 2013 00:01:53 +0000 (08:01 +0800)]
avutil/opencl: add opencl device list APIs 20130411

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a42d6e6c4c19912b73cae8ca9133b4202667c303'
Michael Niedermayer [Thu, 11 Apr 2013 01:38:34 +0000 (03:38 +0200)]
Merge commit 'a42d6e6c4c19912b73cae8ca9133b4202667c303'

* commit 'a42d6e6c4c19912b73cae8ca9133b4202667c303':
  vsrc_movie: switch to an AVOptions-based system.

Conflicts:
doc/filters.texi
libavfilter/src_movie.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b7b3302f8f2c7d9f6e08e0a976890eefe3edcc9e'
Michael Niedermayer [Thu, 11 Apr 2013 01:20:43 +0000 (03:20 +0200)]
Merge commit 'b7b3302f8f2c7d9f6e08e0a976890eefe3edcc9e'

* commit 'b7b3302f8f2c7d9f6e08e0a976890eefe3edcc9e':
  vsrc_nullsrc: switch to an AVOptions-based system.

Conflicts:
libavfilter/vsrc_nullsrc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '7bc1a883c9158bb6e383d86fc76bdf2541e9a9fe'
Michael Niedermayer [Thu, 11 Apr 2013 01:10:43 +0000 (03:10 +0200)]
Merge commit '7bc1a883c9158bb6e383d86fc76bdf2541e9a9fe'

* commit '7bc1a883c9158bb6e383d86fc76bdf2541e9a9fe':
  vsrc_color: switch to an AVOptions-based system.

Conflicts:
doc/filters.texi
libavfilter/vsrc_color.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '73d5d405d424c06f3f354337cfdb24794932094d'
Michael Niedermayer [Thu, 11 Apr 2013 00:49:13 +0000 (02:49 +0200)]
Merge commit '73d5d405d424c06f3f354337cfdb24794932094d'

* commit '73d5d405d424c06f3f354337cfdb24794932094d':
  split: switch to an AVOptions-based system.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b13623e184759f37348b8fdb1276b1bb408f3e59'
Michael Niedermayer [Thu, 11 Apr 2013 00:42:53 +0000 (02:42 +0200)]
Merge commit 'b13623e184759f37348b8fdb1276b1bb408f3e59'

* commit 'b13623e184759f37348b8fdb1276b1bb408f3e59':
  af_volume: switch to an AVOptions-based system.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMove misplaced file author information where it belongs
Diego Biurrun [Wed, 10 Apr 2013 17:26:49 +0000 (19:26 +0200)]
Move misplaced file author information where it belongs

6 years agoMerge remote-tracking branch 'richardpl/biquads'
Michael Niedermayer [Thu, 11 Apr 2013 00:37:59 +0000 (02:37 +0200)]
Merge remote-tracking branch 'richardpl/biquads'

* richardpl/biquads:
  lavfi/biquads: switch to an AVOptions-based system

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'dd7fc37c71955b78a2687f29e871f714d18de386'
Michael Niedermayer [Thu, 11 Apr 2013 00:33:31 +0000 (02:33 +0200)]
Merge commit 'dd7fc37c71955b78a2687f29e871f714d18de386'

* commit 'dd7fc37c71955b78a2687f29e871f714d18de386':
  af_join: switch to an AVOptions-based system.

Conflicts:
doc/filters.texi
libavfilter/af_join.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/biquads: switch to an AVOptions-based system
Paul B Mahol [Thu, 11 Apr 2013 00:30:28 +0000 (00:30 +0000)]
lavfi/biquads: switch to an AVOptions-based system

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge remote-tracking branch 'richardpl/framestep'
Michael Niedermayer [Thu, 11 Apr 2013 00:23:01 +0000 (02:23 +0200)]
Merge remote-tracking branch 'richardpl/framestep'

* richardpl/framestep:
  lavfi/framestep: remove request_frame hack
  lavfi/framestep: switch to an AVOptions-based system

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/framestep: remove request_frame hack
Paul B Mahol [Thu, 11 Apr 2013 00:09:47 +0000 (00:09 +0000)]
lavfi/framestep: remove request_frame hack

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/framestep: switch to an AVOptions-based system
Paul B Mahol [Thu, 11 Apr 2013 00:03:23 +0000 (00:03 +0000)]
lavfi/framestep: switch to an AVOptions-based system

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge commit '3f14febbdf7c93bbd186399da27991180e5916b6'
Michael Niedermayer [Thu, 11 Apr 2013 00:17:28 +0000 (02:17 +0200)]
Merge commit '3f14febbdf7c93bbd186399da27991180e5916b6'

* commit '3f14febbdf7c93bbd186399da27991180e5916b6':
  af_channelsplit: switch to an AVOptions-based system.

Conflicts:
libavfilter/af_channelsplit.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ba8efac977f4276f05274947b2b67d144cbc965a'
Michael Niedermayer [Thu, 11 Apr 2013 00:03:31 +0000 (02:03 +0200)]
Merge commit 'ba8efac977f4276f05274947b2b67d144cbc965a'

* commit 'ba8efac977f4276f05274947b2b67d144cbc965a':
  af_channelmap: switch to an AVOptions-based system.

Conflicts:
doc/filters.texi
libavfilter/af_channelmap.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'mbouron/shorthand-cleanup'
Michael Niedermayer [Wed, 10 Apr 2013 23:53:08 +0000 (01:53 +0200)]
Merge remote-tracking branch 'mbouron/shorthand-cleanup'

* mbouron/shorthand-cleanup:
  lavfi/aphaser: switch to AVOption-based system
  lavfi/apad: switch to AVOption-based system
  lavfi/afade: switch to AVOption-base system
  lavfi/blend: switch to AVOption-based system

Conflicts:
libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b2b25b0659fa047da6266d2ce165d43011136b30'
Michael Niedermayer [Wed, 10 Apr 2013 23:39:15 +0000 (01:39 +0200)]
Merge commit 'b2b25b0659fa047da6266d2ce165d43011136b30'

* commit 'b2b25b0659fa047da6266d2ce165d43011136b30':
  af_asyncts: switch to an AVOptions-based system.

Conflicts:
libavfilter/af_asyncts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/aphaser: switch to AVOption-based system
Matthieu Bouron [Wed, 10 Apr 2013 23:37:57 +0000 (01:37 +0200)]
lavfi/aphaser: switch to AVOption-based system

6 years agoMerge commit 'ac20e3ab8ed497549ee2a62754f01eee5e7a5066'
Michael Niedermayer [Wed, 10 Apr 2013 23:25:08 +0000 (01:25 +0200)]
Merge commit 'ac20e3ab8ed497549ee2a62754f01eee5e7a5066'

* commit 'ac20e3ab8ed497549ee2a62754f01eee5e7a5066':
  af_amix: switch to an AVOptions-based system.

Conflicts:
libavfilter/af_amix.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/apad: switch to AVOption-based system
Matthieu Bouron [Wed, 10 Apr 2013 23:31:08 +0000 (01:31 +0200)]
lavfi/apad: switch to AVOption-based system

6 years agolavfi/afade: switch to AVOption-base system
Matthieu Bouron [Wed, 10 Apr 2013 23:22:53 +0000 (01:22 +0200)]
lavfi/afade: switch to AVOption-base system

6 years agolavfi/blend: switch to AVOption-based system
Matthieu Bouron [Wed, 10 Apr 2013 23:06:16 +0000 (01:06 +0200)]
lavfi/blend: switch to AVOption-based system

6 years agoMerge commit '7536c671040f1f3ebc9f0d3b7831dac71436b775'
Michael Niedermayer [Wed, 10 Apr 2013 23:14:01 +0000 (01:14 +0200)]
Merge commit '7536c671040f1f3ebc9f0d3b7831dac71436b775'

* commit '7536c671040f1f3ebc9f0d3b7831dac71436b775':
  vf_yadif: switch to an AVOptions-based system.

Conflicts:
doc/filters.texi
libavfilter/vf_yadif.c
libavfilter/yadif.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'ubitux/shorthand-cleanup'
Michael Niedermayer [Wed, 10 Apr 2013 23:05:14 +0000 (01:05 +0200)]
Merge remote-tracking branch 'ubitux/shorthand-cleanup'

* ubitux/shorthand-cleanup:
  lavfi/idet: switch to an AVOptions-based system.
  lavfi/histogram: switch to an AVOptions-based system.
  lavfi/stereo3d: switch to an AVOptions-based system.
  lavfi/noise: switch to an AVOptions-based system.
  lavfi/histeq: switch to an AVOptions-based system.

Conflicts:
libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/idet: switch to an AVOptions-based system.
Clément Bœsch [Wed, 10 Apr 2013 23:01:49 +0000 (01:01 +0200)]
lavfi/idet: switch to an AVOptions-based system.

6 years agolavfi/histogram: switch to an AVOptions-based system.
Clément Bœsch [Wed, 10 Apr 2013 22:57:35 +0000 (00:57 +0200)]
lavfi/histogram: switch to an AVOptions-based system.

6 years agolavfi/stereo3d: switch to an AVOptions-based system.
Clément Bœsch [Wed, 10 Apr 2013 22:54:27 +0000 (00:54 +0200)]
lavfi/stereo3d: switch to an AVOptions-based system.

6 years agolavfi/noise: switch to an AVOptions-based system.
Clément Bœsch [Wed, 10 Apr 2013 22:52:39 +0000 (00:52 +0200)]
lavfi/noise: switch to an AVOptions-based system.

6 years agolavfi/histeq: switch to an AVOptions-based system.
Clément Bœsch [Wed, 10 Apr 2013 22:40:33 +0000 (00:40 +0200)]
lavfi/histeq: switch to an AVOptions-based system.

6 years agoMerge remote-tracking branch 'mbouron/shorthand-cleanup'
Michael Niedermayer [Wed, 10 Apr 2013 23:03:02 +0000 (01:03 +0200)]
Merge remote-tracking branch 'mbouron/shorthand-cleanup'

* mbouron/shorthand-cleanup:
  lavfi/kerndeint: switch to AVOption-based system
  lavfi/il: switch to AVOption-based system

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b83e9efc53e5491716625aa31c69006b1119b280'
Michael Niedermayer [Wed, 10 Apr 2013 22:50:53 +0000 (00:50 +0200)]
Merge commit 'b83e9efc53e5491716625aa31c69006b1119b280'

* commit 'b83e9efc53e5491716625aa31c69006b1119b280':
  vf_unsharp: switch to an AVOptions-based system.

Conflicts:
doc/filters.texi
libavfilter/vf_unsharp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/kerndeint: switch to AVOption-based system
Matthieu Bouron [Wed, 10 Apr 2013 22:52:39 +0000 (00:52 +0200)]
lavfi/kerndeint: switch to AVOption-based system

6 years agoMerge remote-tracking branch 'ubitux/shorthand-cleanup'
Michael Niedermayer [Wed, 10 Apr 2013 22:37:21 +0000 (00:37 +0200)]
Merge remote-tracking branch 'ubitux/shorthand-cleanup'

* ubitux/shorthand-cleanup:
  lavfi/mptestsrc: switch to an AVOptions-based system.
  lavfi/mandelbrot: switch to an AVOptions-based system.
  lavfi/life: switch to an AVOptions-based system.
  lavfi/cellauto: switch to an AVOptions-based system.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '0c2466dec719b933d161f5d680a57fde38aa5daa'
Michael Niedermayer [Wed, 10 Apr 2013 22:32:50 +0000 (00:32 +0200)]
Merge commit '0c2466dec719b933d161f5d680a57fde38aa5daa'

* commit '0c2466dec719b933d161f5d680a57fde38aa5daa':
  vf_transpose: switch to an AVOptions-based system.

Conflicts:
doc/filters.texi
libavfilter/vf_transpose.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/il: switch to AVOption-based system
Matthieu Bouron [Wed, 10 Apr 2013 22:27:31 +0000 (00:27 +0200)]
lavfi/il: switch to AVOption-based system