ffmpeg.git
7 years agolavfi/testsrc: make use of AV_OPT_TYPE_DURATION
Stefano Sabatini [Fri, 12 Apr 2013 21:58:02 +0000 (23:58 +0200)]
lavfi/testsrc: make use of AV_OPT_TYPE_DURATION

Simplify.

7 years agolavfi: drop now unused shorthand field from AVFilter.
Clément Bœsch [Fri, 12 Apr 2013 22:45:30 +0000 (00:45 +0200)]
lavfi: drop now unused shorthand field from AVFilter.

7 years agoavutil/opencl: merge opencl env to opencl context
highgod0401 [Fri, 12 Apr 2013 06:53:35 +0000 (14:53 +0800)]
avutil/opencl: merge opencl env to opencl context

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 12 Apr 2013 21:38:41 +0000 (23:38 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: dsputil: Move some ifdefs to avoid unused variable warnings

Conflicts:
libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '2004c7c8f763280ff3ba675ea21cf25396528fd3'
Michael Niedermayer [Fri, 12 Apr 2013 20:44:08 +0000 (22:44 +0200)]
Merge commit '2004c7c8f763280ff3ba675ea21cf25396528fd3'

* commit '2004c7c8f763280ff3ba675ea21cf25396528fd3':
  x86: dsputil: cosmetics: Remove two pointless variable indirections

Conflicts:
libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/utils: use @code markup for opencl function names.
Clément Bœsch [Fri, 12 Apr 2013 21:10:59 +0000 (23:10 +0200)]
doc/utils: use @code markup for opencl function names.

7 years agoMerge commit 'c51a3a5bd9a5b404176ff343ecadb80b2553b256'
Michael Niedermayer [Fri, 12 Apr 2013 20:36:31 +0000 (22:36 +0200)]
Merge commit 'c51a3a5bd9a5b404176ff343ecadb80b2553b256'

* commit 'c51a3a5bd9a5b404176ff343ecadb80b2553b256':
  x86: dsputil: Refactor some ff_{avg|put}_pixels function declarations

Conflicts:
libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'e027032fc6a49db5a4ce12fc3e09ffb86ff20522'
Michael Niedermayer [Fri, 12 Apr 2013 20:26:44 +0000 (22:26 +0200)]
Merge commit 'e027032fc6a49db5a4ce12fc3e09ffb86ff20522'

* commit 'e027032fc6a49db5a4ce12fc3e09ffb86ff20522':
  x86: dsputil: ff_h263_*_loop_filter declarations to a more suitable place

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'a89c05500f68d94a0269e68bc522abfd420c5497'
Michael Niedermayer [Fri, 12 Apr 2013 20:21:27 +0000 (22:21 +0200)]
Merge commit 'a89c05500f68d94a0269e68bc522abfd420c5497'

* commit 'a89c05500f68d94a0269e68bc522abfd420c5497':
  x86: h264qpel: int --> ptrdiff_t for some line_size parameters

Conflicts:
libavcodec/x86/qpelbase.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/hue: add support for more alpha formats
Paul B Mahol [Fri, 12 Apr 2013 18:41:41 +0000 (18:41 +0000)]
lavfi/hue: add support for more alpha formats

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoavdevice/lavfi: add error checking for av_opt_set_int_list()
Michael Niedermayer [Fri, 12 Apr 2013 18:34:35 +0000 (20:34 +0200)]
avdevice/lavfi: add error checking for av_opt_set_int_list()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffplay: replace opaque/params for buffersinks
Michael Niedermayer [Fri, 12 Apr 2013 18:28:34 +0000 (20:28 +0200)]
ffplay: replace opaque/params for buffersinks

This fixes a regression caused by droping opaque.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/hue: copy alpha plane too
Paul B Mahol [Fri, 12 Apr 2013 18:32:46 +0000 (18:32 +0000)]
lavfi/hue: copy alpha plane too

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavfi/hue: make do while (0) form meaningful.
Clément Bœsch [Fri, 12 Apr 2013 18:10:58 +0000 (20:10 +0200)]
lavfi/hue: make do while (0) form meaningful.

7 years agolavfi/crop: log pos in debug message
Stefano Sabatini [Fri, 12 Apr 2013 17:16:28 +0000 (19:16 +0200)]
lavfi/crop: log pos in debug message

7 years agolavfi/crop: restore pos constant, and fix "t" variable misplacement in variable array
Stefano Sabatini [Fri, 12 Apr 2013 17:15:06 +0000 (19:15 +0200)]
lavfi/crop: restore pos constant, and fix "t" variable misplacement in variable array

Fix evaluation of expressions containing the t variable.

7 years agodoc/utils: apply misc fixes to OpenCL docs
Stefano Sabatini [Fri, 12 Apr 2013 16:21:28 +0000 (18:21 +0200)]
doc/utils: apply misc fixes to OpenCL docs

7 years agodoc: merge syntax.texi, eval.texi and opencl.texi into utils.texi
Stefano Sabatini [Fri, 12 Apr 2013 16:14:17 +0000 (18:14 +0200)]
doc: merge syntax.texi, eval.texi and opencl.texi into utils.texi

7 years agodoc/libavutil: remove include of opencl.texi
Stefano Sabatini [Fri, 12 Apr 2013 16:14:57 +0000 (18:14 +0200)]
doc/libavutil: remove include of opencl.texi

This is inconsistent with the rest of the docs.

7 years agovf_interlace: fix frame rate
Michael Niedermayer [Fri, 12 Apr 2013 14:40:35 +0000 (16:40 +0200)]
vf_interlace: fix frame rate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 12 Apr 2013 14:26:08 +0000 (16:26 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  FATE: add a test for the interlace filter
  lavfi: new interlace filter

Conflicts:
Changelog
configure
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
tests/fate/filter.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '921046008f5335601f9d76dc3a768eb5cd91e1b9'
Michael Niedermayer [Fri, 12 Apr 2013 14:14:36 +0000 (16:14 +0200)]
Merge commit '921046008f5335601f9d76dc3a768eb5cd91e1b9'

* commit '921046008f5335601f9d76dc3a768eb5cd91e1b9':
  cmdutils: allow -h filter=<name> to print information about a filter.

Conflicts:
cmdutils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'e19e8aeeaaff3d4bc8f6065764c93f0298782ac6'
Michael Niedermayer [Fri, 12 Apr 2013 13:56:20 +0000 (15:56 +0200)]
Merge commit 'e19e8aeeaaff3d4bc8f6065764c93f0298782ac6'

* commit 'e19e8aeeaaff3d4bc8f6065764c93f0298782ac6':
  avtools: move media_type_string() from avprobe to cmdutils.

Conflicts:
avprobe.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter: add missing AV_OPT_FLAG_FILTERING_PARAM
Michael Niedermayer [Fri, 12 Apr 2013 13:47:16 +0000 (15:47 +0200)]
avfilter: add missing AV_OPT_FLAG_FILTERING_PARAM

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoasetpts: add AVOptions
Michael Niedermayer [Fri, 12 Apr 2013 13:46:52 +0000 (15:46 +0200)]
asetpts: add AVOptions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter: Filter options that are used for both video and audio should have both...
Michael Niedermayer [Fri, 12 Apr 2013 13:45:28 +0000 (15:45 +0200)]
avfilter: Filter options that are used for both video and audio should have both flags

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'dc574658d15ad8f171dbdecbdce7197acf9424a0'
Michael Niedermayer [Fri, 12 Apr 2013 13:33:37 +0000 (15:33 +0200)]
Merge commit 'dc574658d15ad8f171dbdecbdce7197acf9424a0'

* commit 'dc574658d15ad8f171dbdecbdce7197acf9424a0':
  avconv: print filter options in -h full output.

Conflicts:
ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'bee2d75b66e2f02e0877796c01202299a4b56cfb'
Michael Niedermayer [Fri, 12 Apr 2013 13:19:32 +0000 (15:19 +0200)]
Merge commit 'bee2d75b66e2f02e0877796c01202299a4b56cfb'

* commit 'bee2d75b66e2f02e0877796c01202299a4b56cfb':
  avconv: update to the new options syntax.

Conflicts:
ffmpeg_filter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'f160c6a18a574b4c7d063e0a748037cbbd9912ee'
Michael Niedermayer [Fri, 12 Apr 2013 13:13:59 +0000 (15:13 +0200)]
Merge commit 'f160c6a18a574b4c7d063e0a748037cbbd9912ee'

* commit 'f160c6a18a574b4c7d063e0a748037cbbd9912ee':
  lavfi: do not segfault on NULL passed to avfilter_get_by_name()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da'
Michael Niedermayer [Fri, 12 Apr 2013 13:01:41 +0000 (15:01 +0200)]
Merge commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da'

* commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da':
  lavfi: change the filter registering system to match the other libraries

Conflicts:
cmdutils.c
ffplay.c
libavfilter/avfilter.c
libavfilter/avfilter.h

This removes the ability to put AVFilters in read only memory and having
them shareable.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '7e8fe4be5fb4c98aa3c6a4ed3cec999f4e3cc3aa'
Michael Niedermayer [Fri, 12 Apr 2013 12:49:25 +0000 (14:49 +0200)]
Merge commit '7e8fe4be5fb4c98aa3c6a4ed3cec999f4e3cc3aa'

* commit '7e8fe4be5fb4c98aa3c6a4ed3cec999f4e3cc3aa':
  lavfi: add a function for counting elements in AVFilterPad arrays.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '7cdd737ba81b5c2c9521c4509edf0ac315fabc65'
Michael Niedermayer [Fri, 12 Apr 2013 12:30:29 +0000 (14:30 +0200)]
Merge commit '7cdd737ba81b5c2c9521c4509edf0ac315fabc65'

* commit '7cdd737ba81b5c2c9521c4509edf0ac315fabc65':
  lavfi: mark filters with dynamic number of inputs or outputs with special flags

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '1ba95a9cca57b023b9b9de071a5671fc05b05e58'
Michael Niedermayer [Fri, 12 Apr 2013 12:25:27 +0000 (14:25 +0200)]
Merge commit '1ba95a9cca57b023b9b9de071a5671fc05b05e58'

* commit '1ba95a9cca57b023b9b9de071a5671fc05b05e58':
  lavfi: add avfilter_init_dict() for initializing a filter with a dict.

Conflicts:
libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi: fix forgotten chunk in eb0f774d.
Clément Bœsch [Fri, 12 Apr 2013 12:07:59 +0000 (14:07 +0200)]
lavfi: fix forgotten chunk in eb0f774d.

7 years agoavfilter: remove opaque passing hacks
Michael Niedermayer [Thu, 11 Apr 2013 23:55:59 +0000 (01:55 +0200)]
avfilter: remove opaque passing hacks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobuffersink: switch from opaque to AVOptions for params
Michael Niedermayer [Fri, 12 Apr 2013 11:47:40 +0000 (13:47 +0200)]
buffersink: switch from opaque to AVOptions for params

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoabuffersink: switch from opaque to AVOptions for params
Michael Niedermayer [Fri, 12 Apr 2013 11:38:00 +0000 (13:38 +0200)]
abuffersink: switch from opaque to AVOptions for params

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/ocv: fix crash with no dilate arguments.
Clément Bœsch [Fri, 12 Apr 2013 11:01:17 +0000 (13:01 +0200)]
lavfi/ocv: fix crash with no dilate arguments.

7 years agolavfi/ocv: fix crash with no filter name specified.
Clément Bœsch [Fri, 12 Apr 2013 10:44:23 +0000 (12:44 +0200)]
lavfi/ocv: fix crash with no filter name specified.

7 years agolavfi/ocv: fix build after fd6228e65.
Clément Bœsch [Fri, 12 Apr 2013 10:37:33 +0000 (12:37 +0200)]
lavfi/ocv: fix build after fd6228e65.

7 years agobuffersink: remove shorthand
Michael Niedermayer [Fri, 12 Apr 2013 10:25:03 +0000 (12:25 +0200)]
buffersink: remove shorthand

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter: remove mixed args hack for scale.
Michael Niedermayer [Fri, 12 Apr 2013 10:19:48 +0000 (12:19 +0200)]
avfilter: remove mixed args hack for scale.

Our option handling code does not need this hack.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: use options for abuffersink.
Nicolas George [Thu, 11 Apr 2013 12:58:08 +0000 (14:58 +0200)]
ffmpeg: use options for abuffersink.

Also remove unused buffersink_params.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/buffersink: accept parameters as options.
Nicolas George [Thu, 11 Apr 2013 12:58:07 +0000 (14:58 +0200)]
lavfi/buffersink: accept parameters as options.

Move validation from init to query_formats().
Accept the formats lists as binary options.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavu: add helper functions for integer lists.
Nicolas George [Thu, 11 Apr 2013 12:58:06 +0000 (14:58 +0200)]
lavu: add helper functions for integer lists.

Add av_int_list_length() to compute a list length.
Add av_opt_set_int_list() to set a binary option.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter/asrc_aevalsrc: fix return code, 2nd try
Michael Niedermayer [Fri, 12 Apr 2013 10:02:06 +0000 (12:02 +0200)]
avfilter/asrc_aevalsrc: fix return code, 2nd try

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi: remove now unused args parameter from AVFilter.init and init_opaque
Michael Niedermayer [Fri, 12 Apr 2013 09:13:33 +0000 (11:13 +0200)]
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>
7 years agolavfi: remove now unused args parameter from AVFilter.init
Anton Khirnov [Wed, 13 Mar 2013 07:26:39 +0000 (08:26 +0100)]
lavfi: remove now unused args parameter from AVFilter.init

Conflicts:

libavfilter/avfilter.c
libavfilter/vf_drawtext.c
libavfilter/vf_lut.c
libavfilter/vf_select.c
libavfilter/vf_setpts.c
libavfilter/vsrc_color.c
libavfilter/vsrc_movie.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter/asrc_aevalsrc: check correct variable
Michael Niedermayer [Fri, 12 Apr 2013 09:28:27 +0000 (11:28 +0200)]
avfilter/asrc_aevalsrc: check correct variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/filters: update volume options description.
Clément Bœsch [Fri, 12 Apr 2013 09:51:54 +0000 (11:51 +0200)]
doc/filters: update volume options description.

7 years agodoc/filters: add quick emboss example
Paul B Mahol [Thu, 11 Apr 2013 18:27:31 +0000 (18:27 +0000)]
doc/filters: add quick emboss example

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoavfilter: remove old shorthand system
Michael Niedermayer [Fri, 12 Apr 2013 08:55:46 +0000 (10:55 +0200)]
avfilter: remove old shorthand system

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/cropdetect: update boxblur options description.
Clément Bœsch [Fri, 12 Apr 2013 08:56:16 +0000 (10:56 +0200)]
doc/cropdetect: update boxblur options description.

7 years agodoc/crop: update boxblur options description.
Clément Bœsch [Fri, 12 Apr 2013 08:53:31 +0000 (10:53 +0200)]
doc/crop: update boxblur options description.

7 years agodoc/filters: update boxblur options description.
Clément Bœsch [Fri, 12 Apr 2013 08:51:29 +0000 (10:51 +0200)]
doc/filters: update boxblur options description.

7 years agodoc/filters: update blackframe options description.
Clément Bœsch [Fri, 12 Apr 2013 08:46:33 +0000 (10:46 +0200)]
doc/filters: update blackframe options description.

7 years agoaf_pan: avoid spaces before % to avoid possible issues with MSVC
Michael Niedermayer [Fri, 12 Apr 2013 08:45:11 +0000 (10:45 +0200)]
af_pan: avoid spaces before % to avoid possible issues with MSVC

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoaf_pan: switch to an AVOptions-based shorthand system.
Michael Niedermayer [Fri, 12 Apr 2013 08:32:41 +0000 (10:32 +0200)]
af_pan: switch to an AVOptions-based shorthand system.

TODO: The first argument can be seperated into its own AVOption

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoaf_pan: fix parsing arguments from the example in the documentation
Серж Нискородов [Fri, 12 Apr 2013 08:02:01 +0000 (10:02 +0200)]
af_pan: fix parsing arguments from the example in the documentation

pan=stereo: FL < FL + 0.5*FC + 0.6*BL + 0.6*SL : FR < FR + 0.5*FC +
0.6*BR + 0.6*SR

didn't actually work ('Expected out channel name, got " FL < FL"')

7 years agoabuffer: switch to an AVOptions-based shorthand system.
Michael Niedermayer [Fri, 12 Apr 2013 07:55:01 +0000 (09:55 +0200)]
abuffer: switch to an AVOptions-based shorthand system.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobuffersrc: switch to an AVOptions-based shorthand system.
Michael Niedermayer [Fri, 12 Apr 2013 07:45:14 +0000 (09:45 +0200)]
buffersrc: switch to an AVOptions-based shorthand system.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86: dsputil: Move some ifdefs to avoid unused variable warnings
Diego Biurrun [Wed, 10 Apr 2013 23:31:15 +0000 (01:31 +0200)]
x86: dsputil: Move some ifdefs to avoid unused variable warnings

7 years agox86: dsputil: cosmetics: Remove two pointless variable indirections
Diego Biurrun [Wed, 10 Apr 2013 23:30:25 +0000 (01:30 +0200)]
x86: dsputil: cosmetics: Remove two pointless variable indirections

7 years agox86: dsputil: Refactor some ff_{avg|put}_pixels function declarations
Diego Biurrun [Thu, 11 Apr 2013 00:31:09 +0000 (02:31 +0200)]
x86: dsputil: Refactor some ff_{avg|put}_pixels function declarations

7 years agox86: dsputil: ff_h263_*_loop_filter declarations to a more suitable place
Diego Biurrun [Wed, 10 Apr 2013 23:19:44 +0000 (01:19 +0200)]
x86: dsputil: ff_h263_*_loop_filter declarations to a more suitable place

7 years agolavfi/atempo: switch to an AVOptions-based system.
Pavel Koshevoy [Fri, 12 Apr 2013 03:21:04 +0000 (21:21 -0600)]
lavfi/atempo: switch to an AVOptions-based system.

Signed-off-by: Pavel Koshevoy <pkoshevoy@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86: h264qpel: int --> ptrdiff_t for some line_size parameters
Diego Biurrun [Wed, 10 Apr 2013 23:17:12 +0000 (01:17 +0200)]
x86: h264qpel: int --> ptrdiff_t for some line_size parameters

7 years agoavfilter: Update scale to dictionary based options
Michael Niedermayer [Fri, 12 Apr 2013 00:34:40 +0000 (02:34 +0200)]
avfilter: Update scale to dictionary based options

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '48a5adab62bd2a553f5069d41fa632a0701835e5'
Michael Niedermayer [Thu, 11 Apr 2013 23:01:48 +0000 (01:01 +0200)]
Merge commit '48a5adab62bd2a553f5069d41fa632a0701835e5'

* commit '48a5adab62bd2a553f5069d41fa632a0701835e5':
  lavfi: add avfilter_init_str() to replace avfilter_init_filter().

avfilter_graph_create_filter() opaque is still passed to avfilter_init_filter()
which continues to pass it to init_opaque as its still used in the buffer sinks
the sinks should be changed and the opaque passing removed

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '1565cbc65cbb9f95c11367314a080068895e0cf0'
Michael Niedermayer [Thu, 11 Apr 2013 22:54:05 +0000 (00:54 +0200)]
Merge commit '1565cbc65cbb9f95c11367314a080068895e0cf0'

* commit '1565cbc65cbb9f95c11367314a080068895e0cf0':
  lavfi: make avfilter_free() remove the filter from its graph.

Conflicts:
libavfilter/avfilter.c
libavfilter/avfiltergraph.c
libavfilter/graphparser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '111367263af41c88a44bd763ceefc11d53a7f655'
Michael Niedermayer [Thu, 11 Apr 2013 22:44:18 +0000 (00:44 +0200)]
Merge commit '111367263af41c88a44bd763ceefc11d53a7f655'

* commit '111367263af41c88a44bd763ceefc11d53a7f655':
  lavfi: add AVFilterContext.graph.

Conflicts:
libavfilter/avfilter.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'c2c9801bc9bce688d51d1a96f5f3ea93933e2dee'
Michael Niedermayer [Thu, 11 Apr 2013 22:39:04 +0000 (00:39 +0200)]
Merge commit 'c2c9801bc9bce688d51d1a96f5f3ea93933e2dee'

* commit 'c2c9801bc9bce688d51d1a96f5f3ea93933e2dee':
  lavfi: deprecate avfilter_graph_add_filter().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'bc1a985ba030e9861d24965d42792850b43a43ea'
Michael Niedermayer [Thu, 11 Apr 2013 21:56:39 +0000 (23:56 +0200)]
Merge commit 'bc1a985ba030e9861d24965d42792850b43a43ea'

* commit 'bc1a985ba030e9861d24965d42792850b43a43ea':
  lavfi: replace avfilter_open() with avfilter_graph_alloc_filter().

Conflicts:
libavfilter/avfiltergraph.c
libavfilter/internal.h
libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/overlay: improve feedback in case of invalid expression
Stefano Sabatini [Thu, 11 Apr 2013 22:06:52 +0000 (00:06 +0200)]
lavfi/overlay: improve feedback in case of invalid expression

Based on vf_hue.c code.

7 years agodoc/filters: rework Commands section for overlay filter
Stefano Sabatini [Thu, 11 Apr 2013 22:01:38 +0000 (00:01 +0200)]
doc/filters: rework Commands section for overlay filter

7 years agodoc/filters: apply minor fixes to hue Commands section
Stefano Sabatini [Thu, 11 Apr 2013 21:59:22 +0000 (23:59 +0200)]
doc/filters: apply minor fixes to hue Commands section

7 years agolavfi/overlay: fix crash in case of invalid expression
Stefano Sabatini [Thu, 11 Apr 2013 21:54:24 +0000 (23:54 +0200)]
lavfi/overlay: fix crash in case of invalid expression

7 years agolavfi/overlay: add repeatlast option
Stefano Sabatini [Fri, 5 Apr 2013 11:49:20 +0000 (13:49 +0200)]
lavfi/overlay: add repeatlast option

7 years agolavfi/overlay: reindent constants in option list
Stefano Sabatini [Fri, 5 Apr 2013 11:14:59 +0000 (13:14 +0200)]
lavfi/overlay: reindent constants in option list

Wanted-By: ubitux
7 years agoMerge commit '38f0c0781a6e099f11c0acec07f9b8be742190c4'
Michael Niedermayer [Thu, 11 Apr 2013 21:40:41 +0000 (23:40 +0200)]
Merge commit '38f0c0781a6e099f11c0acec07f9b8be742190c4'

* commit '38f0c0781a6e099f11c0acec07f9b8be742190c4':
  lavfi: merge avfiltergraph.h into avfilter.h

Conflicts:
doc/APIchanges
ffmpeg_filter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.h
libavfilter/version.h
tools/graph2dot.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/filters: use -af and -filter_complex instead of amovie for two examples.
Clément Bœsch [Thu, 11 Apr 2013 21:45:20 +0000 (23:45 +0200)]
doc/filters: use -af and -filter_complex instead of amovie for two examples.

7 years agoMerge commit '4a37d4b3f8137a4c2bbbca043de076af966b9446'
Michael Niedermayer [Thu, 11 Apr 2013 21:30:57 +0000 (23:30 +0200)]
Merge commit '4a37d4b3f8137a4c2bbbca043de076af966b9446'

* commit '4a37d4b3f8137a4c2bbbca043de076af966b9446':
  lavfi: add const to the pads parameter of avfilter_pad_get_name/type
  lavfi: add const to AVFilterContext.filter.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/mp: switch to an AVOptions-based system.
Clément Bœsch [Thu, 11 Apr 2013 20:39:42 +0000 (22:39 +0200)]
lavfi/mp: switch to an AVOptions-based system.

7 years agodoc/encoders: Clarify that there are 2 prores encoders
Michael Niedermayer [Thu, 11 Apr 2013 21:08:13 +0000 (23:08 +0200)]
doc/encoders: Clarify that there are 2 prores encoders

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec: rename prores encoders
Michael Niedermayer [Thu, 11 Apr 2013 20:47:27 +0000 (22:47 +0200)]
avcodec: rename prores encoders

Using the first names of authors sounds somewhat unprofessional
and might be considered offensive which is not intended.
The new names use the initials of the authors due to simplicity
and the possibility to apply it consistently without the need
to find political correct names for each future case where
alternative codecs might exist. Also its shorter ...

If someone has a better idea, like maybe 2 random letters
and people prefer it then iam happy to switch to that ...

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/filters: fix fade-out hue saturation expression in sendcmd example
Stefano Sabatini [Thu, 11 Apr 2013 21:02:37 +0000 (23:02 +0200)]
doc/filters: fix fade-out hue saturation expression in sendcmd example

7 years agodoc/filters: update hue command syntax after recent update
Stefano Sabatini [Thu, 11 Apr 2013 21:01:07 +0000 (23:01 +0200)]
doc/filters: update hue command syntax after recent update

7 years agolavfi/aspect: fix d2q convert in init.
Clément Bœsch [Thu, 11 Apr 2013 20:46:34 +0000 (22:46 +0200)]
lavfi/aspect: fix d2q convert in init.

Regression since git 71ef1ec7b.

7 years agoMerge commit 'f223ad1e000d56ef5231a3b1fc00495b538a9ed6'
Michael Niedermayer [Thu, 11 Apr 2013 20:36:05 +0000 (22:36 +0200)]
Merge commit 'f223ad1e000d56ef5231a3b1fc00495b538a9ed6'

* commit 'f223ad1e000d56ef5231a3b1fc00495b538a9ed6':
  doc: document the prores encoder options

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '93e65e9a6c0895f869752a66731d9b2ec3916467'
Michael Niedermayer [Thu, 11 Apr 2013 20:04:50 +0000 (22:04 +0200)]
Merge commit '93e65e9a6c0895f869752a66731d9b2ec3916467'

* commit '93e65e9a6c0895f869752a66731d9b2ec3916467':
  Cosmetics, restore alphabetic order in atomics lists.

Conflicts:
libavutil/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi: deprecate aconvert.
Clément Bœsch [Thu, 11 Apr 2013 16:23:18 +0000 (18:23 +0200)]
lavfi: deprecate aconvert.

This filter is not required anymore with aformat. Drop it at next bump.

7 years agolavfi/aspect: switch to an AVOptions-based system.
Clément Bœsch [Thu, 11 Apr 2013 19:59:53 +0000 (21:59 +0200)]
lavfi/aspect: switch to an AVOptions-based system.

This is heavily based on 2831b307 by Anton Khirnov <anton@khirnov.net>

7 years agoMerge commit '9e6b5e61a0c91e25e298d0a21b189c4c95443795'
Michael Niedermayer [Thu, 11 Apr 2013 19:49:26 +0000 (21:49 +0200)]
Merge commit '9e6b5e61a0c91e25e298d0a21b189c4c95443795'

* commit '9e6b5e61a0c91e25e298d0a21b189c4c95443795':
  img2enc: add an option for overwriting one file with subsequent images

Conflicts:
doc/muxers.texi
libavformat/img2enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/flite: switch to AVOption-based system
Stefano Sabatini [Thu, 11 Apr 2013 19:08:46 +0000 (21:08 +0200)]
lavfi/flite: switch to AVOption-based system

7 years agolavfi/hue: extend debugging message
Stefano Sabatini [Thu, 11 Apr 2013 18:56:51 +0000 (20:56 +0200)]
lavfi/hue: extend debugging message

In particular, show h value in degrees.

7 years agolavfi/hue: reindent after last commit
Stefano Sabatini [Thu, 11 Apr 2013 18:42:32 +0000 (20:42 +0200)]
lavfi/hue: reindent after last commit

7 years agolavfi/hue: apply major simplifications, and switch to AVOption-based system
Stefano Sabatini [Wed, 10 Apr 2013 23:12:33 +0000 (01:12 +0200)]
lavfi/hue: apply major simplifications, and switch to AVOption-based system

This also drops support for "flat syntax" and "reinit" command.

"reinit" command is not very robust and complicates the logic more than
necessary, since requires to reset all the options in the command.

*This is a syntax break*.

7 years agoFATE: add a test for the interlace filter
Vittorio Giovara [Thu, 4 Apr 2013 13:39:40 +0000 (15:39 +0200)]
FATE: add a test for the interlace filter

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agolavfi: new interlace filter
Vittorio Giovara [Tue, 12 Mar 2013 10:35:21 +0000 (11:35 +0100)]
lavfi: new interlace filter

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agolavfi/ebur128: remove now unused av_opt_free call.
Clément Bœsch [Thu, 11 Apr 2013 18:52:41 +0000 (20:52 +0200)]
lavfi/ebur128: remove now unused av_opt_free call.