Commit Graph

52359 Commits

Author SHA1 Message Date
Hendrik Leppkes
423089e964 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>
2013-04-13 18:07:08 +02:00
Matthieu Bouron
c8b3644494 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>
2013-04-13 17:26:16 +02:00
Hendrik Leppkes
8da2a3aba3 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>
2013-04-13 16:45:56 +02:00
Hendrik Leppkes
cac309611c 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>
2013-04-13 16:02:52 +02: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
Stefano Sabatini
87dd62e141 lavfi/testsrc: make use of AV_OPT_TYPE_DURATION
Simplify.
2013-04-13 14:09:16 +02:00
Clément Bœsch
dcea58502c lavfi: drop now unused shorthand field from AVFilter. 2013-04-13 00:45:30 +02:00
highgod0401
8f99494c1c avutil/opencl: merge opencl env to opencl context
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 23:54:40 +02:00
Michael Niedermayer
34b78ad04f 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>
2013-04-12 23:38:41 +02:00
Michael Niedermayer
ed3680bc9b 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>
2013-04-12 23:28:23 +02:00
Clément Bœsch
0bc34ef02e doc/utils: use @code markup for opencl function names. 2013-04-12 23:10:59 +02:00
Michael Niedermayer
694fa0035a 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>
2013-04-12 22:36:31 +02:00
Michael Niedermayer
43bf4ee9a9 Merge commit 'e027032fc6a49db5a4ce12fc3e09ffb86ff20522'
* commit 'e027032fc6a49db5a4ce12fc3e09ffb86ff20522':
  x86: dsputil: ff_h263_*_loop_filter declarations to a more suitable place

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 22:29:30 +02:00
Michael Niedermayer
52bda1d903 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>
2013-04-12 22:22:27 +02:00
Paul B Mahol
a47288f6dc lavfi/hue: add support for more alpha formats
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-12 19:46:19 +00:00
Michael Niedermayer
9b595e86e3 avdevice/lavfi: add error checking for av_opt_set_int_list()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 20:39:07 +02:00
Michael Niedermayer
e87c1cdbb5 ffplay: replace opaque/params for buffersinks
This fixes a regression caused by droping opaque.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 20:39:07 +02:00
Paul B Mahol
047a027d0b lavfi/hue: copy alpha plane too
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-12 18:32:46 +00:00
Clément Bœsch
72ad0d56a1 lavfi/hue: make do while (0) form meaningful. 2013-04-12 20:10:58 +02:00
Stefano Sabatini
9fa3b5b8a8 lavfi/crop: log pos in debug message 2013-04-12 19:16:28 +02:00
Stefano Sabatini
1d86fe6970 lavfi/crop: restore pos constant, and fix "t" variable misplacement in variable array
Fix evaluation of expressions containing the t variable.
2013-04-12 19:15:06 +02:00
Stefano Sabatini
9ae9ae10f9 doc/utils: apply misc fixes to OpenCL docs 2013-04-12 18:21:57 +02:00
Stefano Sabatini
949c8627b6 doc: merge syntax.texi, eval.texi and opencl.texi into utils.texi 2013-04-12 18:21:57 +02:00
Stefano Sabatini
b59aa00707 doc/libavutil: remove include of opencl.texi
This is inconsistent with the rest of the docs.
2013-04-12 18:21:57 +02:00
Michael Niedermayer
227b4458fb vf_interlace: fix frame rate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 16:40:35 +02:00
Michael Niedermayer
ebbd4fd5f0 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>
2013-04-12 16:32:33 +02:00
Michael Niedermayer
7e68491367 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>
2013-04-12 16:16:21 +02:00
Michael Niedermayer
608d86013a Merge commit 'e19e8aeeaaff3d4bc8f6065764c93f0298782ac6'
* commit 'e19e8aeeaaff3d4bc8f6065764c93f0298782ac6':
  avtools: move media_type_string() from avprobe to cmdutils.

Conflicts:
	avprobe.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 15:56:20 +02:00
Michael Niedermayer
3dedcef8b8 avfilter: add missing AV_OPT_FLAG_FILTERING_PARAM
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 15:47:16 +02:00
Michael Niedermayer
1007de7033 asetpts: add AVOptions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 15:46:52 +02:00
Michael Niedermayer
292f68154b avfilter: Filter options that are used for both video and audio should have both flags
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 15:45:28 +02:00
Michael Niedermayer
f81a8e89a1 Merge commit 'dc574658d15ad8f171dbdecbdce7197acf9424a0'
* commit 'dc574658d15ad8f171dbdecbdce7197acf9424a0':
  avconv: print filter options in -h full output.

Conflicts:
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 15:33:37 +02:00
Michael Niedermayer
7b6c0bda9e Merge commit 'bee2d75b66e2f02e0877796c01202299a4b56cfb'
* commit 'bee2d75b66e2f02e0877796c01202299a4b56cfb':
  avconv: update to the new options syntax.

Conflicts:
	ffmpeg_filter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 15:19:32 +02:00
Michael Niedermayer
9a91c67478 Merge commit 'f160c6a18a574b4c7d063e0a748037cbbd9912ee'
* commit 'f160c6a18a574b4c7d063e0a748037cbbd9912ee':
  lavfi: do not segfault on NULL passed to avfilter_get_by_name()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 15:14:08 +02:00
Michael Niedermayer
835cc0f2e7 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>
2013-04-12 15:08:40 +02:00
Michael Niedermayer
f4db6bfeb8 Merge commit '7e8fe4be5fb4c98aa3c6a4ed3cec999f4e3cc3aa'
* commit '7e8fe4be5fb4c98aa3c6a4ed3cec999f4e3cc3aa':
  lavfi: add a function for counting elements in AVFilterPad arrays.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 14:49:30 +02:00
Michael Niedermayer
16fc24b240 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>
2013-04-12 14:30:34 +02:00
Michael Niedermayer
46de9ba598 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>
2013-04-12 14:25:27 +02:00
Clément Bœsch
6b5ec76283 lavfi: fix forgotten chunk in eb0f774d. 2013-04-12 14:08:04 +02:00
Michael Niedermayer
0acf7e268b avfilter: remove opaque passing hacks
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 13:56:03 +02:00
Michael Niedermayer
3fc7b47145 buffersink: switch from opaque to AVOptions for params
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 13:47:40 +02:00
Michael Niedermayer
a1e7e02eaf abuffersink: switch from opaque to AVOptions for params
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 13:38:00 +02:00
Clément Bœsch
f16a6f667c lavfi/ocv: fix crash with no dilate arguments. 2013-04-12 13:01:17 +02:00
Clément Bœsch
490786c02e lavfi/ocv: fix crash with no filter name specified. 2013-04-12 12:44:23 +02:00
Clément Bœsch
51e71d6e11 lavfi/ocv: fix build after fd6228e65. 2013-04-12 12:37:33 +02:00
Michael Niedermayer
4a88989254 buffersink: remove shorthand
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 12:25:03 +02:00
Michael Niedermayer
f1e62af0e0 avfilter: remove mixed args hack for scale.
Our option handling code does not need this hack.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 12:19:48 +02:00
Nicolas George
62d888ef0e 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>
2013-04-12 12:11:10 +02:00
Nicolas George
e48ded8551 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>
2013-04-12 12:12:51 +02:00
Nicolas George
af0d270aac 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>
2013-04-12 12:09:51 +02:00