ffmpeg.git
8 years agodeshake: fix off by 2 error
Michael Niedermayer [Mon, 15 Apr 2013 14:23:28 +0000 (16:23 +0200)]
deshake: fix off by 2 error

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovf_deshake: Fix crash with r*=64
Michael Niedermayer [Mon, 15 Apr 2013 12:28:19 +0000 (14:28 +0200)]
vf_deshake: Fix crash with r*=64

Replace literal numbers by named R_MAX and correct their value

Fixes half of Ticket2443

Based on patch by: João Bernardo <jbvsmo@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodfa: support decoding version=1.0
Michael Niedermayer [Mon, 15 Apr 2013 10:07:12 +0000 (12:07 +0200)]
dfa: support decoding version=1.0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavfi/curves: add support for Photoshop curves files (.acv).
Clément Bœsch [Mon, 15 Apr 2013 01:49:36 +0000 (03:49 +0200)]
lavfi/curves: add support for Photoshop curves files (.acv).

8 years agolavfi/curves: add support for master component.
Clément Bœsch [Mon, 15 Apr 2013 08:53:54 +0000 (10:53 +0200)]
lavfi/curves: add support for master component.

8 years agosws: remove forgotten FAST_BGR2YV12 define
Michael Niedermayer [Mon, 15 Apr 2013 01:40:50 +0000 (03:40 +0200)]
sws: remove forgotten FAST_BGR2YV12 define

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoAdd thread-safe wrapper for get_format().
Reimar Döffinger [Sun, 7 Apr 2013 08:17:09 +0000 (10:17 +0200)]
Add thread-safe wrapper for get_format().

Just like get_buffer, get_format should not be called from a different
thread if thread_safe_callbacks is not set.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoFix compilation on ARM with android gcc 4.7
Reimar Döffinger [Sat, 16 Mar 2013 12:36:20 +0000 (13:36 +0100)]
Fix compilation on ARM with android gcc 4.7

With the current code it fails due to running out
of registers.
So code the store offsets manually into the assembler
instead.
Passes "make fate-dts".

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agosws/x86: remove 8bit rgb2yuv coefficient case for rgb24toyv12 special converter
Michael Niedermayer [Mon, 15 Apr 2013 01:16:14 +0000 (03:16 +0200)]
sws/x86: remove 8bit rgb2yuv coefficient case for rgb24toyv12 special converter

This simplifies the code and improves quality at the expense of a slight
slowdown of a rarely used function (no fate test uses it).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosws: Update rgb24toyv12_c() to user supplied rgb2yuv tables
Michael Niedermayer [Mon, 15 Apr 2013 01:01:04 +0000 (03:01 +0200)]
sws: Update rgb24toyv12_c() to user supplied rgb2yuv tables

As the function arguments change, we also change the function name
to ensure that anyone using this (non public) function doesnt end
with hard to debug crashes. The new name also has a proper prefix.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosws/"rgb2rgb": drop RGB2YUV_SHIFT
Michael Niedermayer [Mon, 15 Apr 2013 00:27:14 +0000 (02:27 +0200)]
sws/"rgb2rgb": drop RGB2YUV_SHIFT

Fixes a warning and increases the precission the coefficients

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosws/x86: update rgba->yuv to use user supplied table
Michael Niedermayer [Sun, 14 Apr 2013 22:57:26 +0000 (00:57 +0200)]
sws/x86: update rgba->yuv to use user supplied table

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosws/x86: update rgb/bgr->yuv code to use provided coefficient table
Michael Niedermayer [Sun, 14 Apr 2013 22:49:00 +0000 (00:49 +0200)]
sws/x86: update rgb/bgr->yuv code to use provided coefficient table

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosws: init input_rgb2yuv_table depending on yuv colorspace
Michael Niedermayer [Sun, 14 Apr 2013 21:52:31 +0000 (23:52 +0200)]
sws: init input_rgb2yuv_table depending on yuv colorspace

For the default table we keep using the exact previous
coefficients, this way individual functions can be updated seperately
without breaking fate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosws: move RGB2YUV_SHIFT to swscale_internal.h
Michael Niedermayer [Sun, 14 Apr 2013 21:51:58 +0000 (23:51 +0200)]
sws: move RGB2YUV_SHIFT to swscale_internal.h

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavf/libquvi: fix error reporting.
Clément Bœsch [Sun, 14 Apr 2013 23:18:11 +0000 (01:18 +0200)]
lavf/libquvi: fix error reporting.

8 years agolavfi/aphaser: silence uninitialized variable warnings.
Clément Bœsch [Sun, 14 Apr 2013 23:12:26 +0000 (01:12 +0200)]
lavfi/aphaser: silence uninitialized variable warnings.

8 years agolavfi/negate: stop calling lut_init() as that function does nothing now
Paul B Mahol [Sun, 14 Apr 2013 22:22:16 +0000 (22:22 +0000)]
lavfi/negate: stop calling lut_init() as that function does nothing now

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agolavfi/testsrc: unbreak smptebars only build
Paul B Mahol [Sun, 14 Apr 2013 21:11:28 +0000 (21:11 +0000)]
lavfi/testsrc: unbreak smptebars only build

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agolavf: remove some flushing in write_packet muxers callbacks.
Clément Bœsch [Sun, 24 Mar 2013 23:23:46 +0000 (00:23 +0100)]
lavf: remove some flushing in write_packet muxers callbacks.

Since 4f112a8e3, this is not necessary anymore. Also, it allows to
actually disable the flushing.

8 years agodoc/filters: remove mention to telecine mp filter
Stefano Sabatini [Sun, 14 Apr 2013 19:10:45 +0000 (21:10 +0200)]
doc/filters: remove mention to telecine mp filter

It was removed in 32a7b858c9175b851503dc3fa66440efe2afd3ee.

8 years agolavfi: add missing periods in filter descriptions.
Clément Bœsch [Sun, 14 Apr 2013 18:58:31 +0000 (20:58 +0200)]
lavfi: add missing periods in filter descriptions.

8 years agoffmpeg: show error message in case of av_buffersrc_add_frame_flags() failure
Stefano Sabatini [Sat, 13 Apr 2013 11:16:23 +0000 (13:16 +0200)]
ffmpeg: show error message in case of av_buffersrc_add_frame_flags() failure

8 years agodoc: document -opencl_options option in ff* tools manuals
Stefano Sabatini [Fri, 12 Apr 2013 18:05:10 +0000 (20:05 +0200)]
doc: document -opencl_options option in ff* tools manuals

8 years agoAdd avpriv_dsputil_init() and use it in lavfi where relevant.
Clément Bœsch [Sun, 14 Apr 2013 02:34:06 +0000 (04:34 +0200)]
Add avpriv_dsputil_init() and use it in lavfi where relevant.

dsputil_init() is deprecated and not meant to be exported.
ff_dsputil_init() is internal to libavcodec and thus can not be used.
avpriv_dsputil_init() is the version shared between libraries.

This commit fixes 3 unjustified libavfilter deprecated warnings.

8 years agosws/input: replace hardcoded rgb2yuv coefficients by table
Michael Niedermayer [Sun, 14 Apr 2013 17:55:06 +0000 (19:55 +0200)]
sws/input: replace hardcoded rgb2yuv coefficients by table

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswscale/output: fix alpha scale in the new functions
Michael Niedermayer [Sun, 14 Apr 2013 14:56:42 +0000 (16:56 +0200)]
swscale/output: fix alpha scale in the new functions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosws/output: add yuv2rgb_full_1_c_template()
Michael Niedermayer [Sun, 14 Apr 2013 14:14:22 +0000 (16:14 +0200)]
sws/output: add yuv2rgb_full_1_c_template()

7500->4500 cycles on sandybridge

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodoc/filters: move mpdecimate doc to a more appropriate position.
Clément Bœsch [Sun, 14 Apr 2013 13:57:37 +0000 (15:57 +0200)]
doc/filters: move mpdecimate doc to a more appropriate position.

8 years agolavfi: port IVTC filters from vapoursynth.
Clément Bœsch [Mon, 10 Dec 2012 23:53:10 +0000 (00:53 +0100)]
lavfi: port IVTC filters from vapoursynth.

8 years agolavfi: rename decimate to mpdecimate.
Clément Bœsch [Fri, 22 Mar 2013 21:58:36 +0000 (22:58 +0100)]
lavfi: rename decimate to mpdecimate.

The next commit will introduce a proper decimation filter to be used
along with the field matching filter. To avoid confusion with this
filter which has currently a very limited usage (and will not work
properly with the fieldmatching filter), the new decimation filter will
take the decimate name, and this filter is renamed to mpdecimate.

8 years agosws/output: add +yuv2rgb_full_2_c_template()
Michael Niedermayer [Sun, 14 Apr 2013 13:32:11 +0000 (15:32 +0200)]
sws/output: add +yuv2rgb_full_2_c_template()

8100 cycles -> 5800 cycles on sandybridge

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosws/output: factor yuv2rgb_write_full() out
Michael Niedermayer [Sun, 14 Apr 2013 11:17:04 +0000 (13:17 +0200)]
sws/output: factor yuv2rgb_write_full() out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavfi/smptehdbars: fix priv_class pointer.
Clément Bœsch [Sun, 14 Apr 2013 08:32:23 +0000 (10:32 +0200)]
lavfi/smptehdbars: fix priv_class pointer.

Fix Ticket2468.

8 years agolavfi/testsrc: grammar fix in comment after 03e2ec32.
Clément Bœsch [Sun, 14 Apr 2013 01:27:48 +0000 (03:27 +0200)]
lavfi/testsrc: grammar fix in comment after 03e2ec32.

8 years agolavfi: add smptehdbars source
Paul B Mahol [Thu, 11 Apr 2013 15:49:44 +0000 (15:49 +0000)]
lavfi: add smptehdbars source

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agodoc/filters: move telecine from audio to video filters
Paul B Mahol [Sat, 13 Apr 2013 23:17:38 +0000 (23:17 +0000)]
doc/filters: move telecine from audio to video filters

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agolavu/dict: cosmetic realign.
Clément Bœsch [Sat, 13 Apr 2013 19:13:52 +0000 (21:13 +0200)]
lavu/dict: cosmetic realign.

8 years agolog: Remove redundant va_list creation from missing_feature_sample()
James Almer [Fri, 5 Apr 2013 06:49:17 +0000 (03:49 -0300)]
log: Remove redundant va_list creation from missing_feature_sample()

avpriv_request_sample() and avpriv_report_missing_feature() were printing bogus values for the extra arguments.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'cigaes/master'
Michael Niedermayer [Sat, 13 Apr 2013 18:38:26 +0000 (20:38 +0200)]
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavu/opt: check int lists length for overflow.
  lavu: add parens to macro argument.
  lavu: add av_pure to av_int_list_length_for_size.
  lavfi/buffersink: factor checks for lists sizes.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agooggenc: Fix pref_duration AVOption type
Michael Niedermayer [Sat, 13 Apr 2013 18:23:01 +0000 (20:23 +0200)]
oggenc: Fix pref_duration AVOption type

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavu/opt: check int lists length for overflow.
Nicolas George [Sat, 13 Apr 2013 09:46:56 +0000 (11:46 +0200)]
lavu/opt: check int lists length for overflow.

Also add parens on macro arguments.

8 years agolavu: add parens to macro argument.
Nicolas George [Sat, 13 Apr 2013 09:47:27 +0000 (11:47 +0200)]
lavu: add parens to macro argument.

8 years agolavu: add av_pure to av_int_list_length_for_size.
Nicolas George [Sat, 13 Apr 2013 09:37:16 +0000 (11:37 +0200)]
lavu: add av_pure to av_int_list_length_for_size.

8 years agolavfi/buffersink: factor checks for lists sizes.
Nicolas George [Sat, 13 Apr 2013 09:27:52 +0000 (11:27 +0200)]
lavfi/buffersink: factor checks for lists sizes.

8 years agoavcodec: fix ignorecrop AVOption offset
Michael Niedermayer [Sat, 13 Apr 2013 17:55:49 +0000 (19:55 +0200)]
avcodec: fix ignorecrop AVOption offset

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodoc/filters: use common options introduction string.
Clément Bœsch [Sat, 13 Apr 2013 18:09:22 +0000 (20:09 +0200)]
doc/filters: use common options introduction string.

8 years agocmdutils: print if filters are sources or sinks.
Clément Bœsch [Sat, 13 Apr 2013 17:48:10 +0000 (19:48 +0200)]
cmdutils: print if filters are sources or sinks.

8 years agolavfi: flag more dynamic i/o filters.
Clément Bœsch [Sat, 13 Apr 2013 17:43:17 +0000 (19:43 +0200)]
lavfi: flag more dynamic i/o filters.

8 years agolavf/mxfdec: validate month/day before date formatting
Hendrik Leppkes [Sat, 13 Apr 2013 13:45:57 +0000 (15:45 +0200)]
lavf/mxfdec: validate month/day before date formatting

Some implementations of strftime do not like invalid values for
month/day, so ensure it doesn't happen.

Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavf/mxf: fix parsing of timestamps
Matthieu Bouron [Sat, 13 Apr 2013 15:12:20 +0000 (17:12 +0200)]
lavf/mxf: fix parsing of timestamps

Correct bit mask for month/day/hour/min/sec values.

For reference the timestamp format specified in S377M is as follow:
  year (int16), month (uint8), day (uint8), hour (uint8), sec (uint8),
  msec (uint8).
A value of 0 for every fields means timestamp "unknown".

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavf/mxfdec: use more widely supported time format string
Hendrik Leppkes [Sat, 13 Apr 2013 13:45:56 +0000 (15:45 +0200)]
lavf/mxfdec: use more widely supported time format string

MSVC lacks support for %T and %F, but the standard specifies them
only as shorthands to the long variants.

Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavf/mxf: fix parsing of the month from mxf timestamps
Hendrik Leppkes [Sat, 13 Apr 2013 13:45:55 +0000 (15:45 +0200)]
lavf/mxf: fix parsing of the month from mxf timestamps

Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovf_mp: mp buffers are not compatible with the reference count system
Michael Niedermayer [Sat, 13 Apr 2013 13:00:22 +0000 (15:00 +0200)]
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>
8 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.

8 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.

8 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>
8 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>
8 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>
8 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.

8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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.

8 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

8 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.

8 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

8 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

8 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.

8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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.

8 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>
8 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>
8 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>
8 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.

8 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.

8 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.

8 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>
8 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>
8 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>
8 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>
8 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>
8 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>