xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-24 20:19:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
51,857 Commits 31 Branches 338 Tags 298 MiB
cb20ca14a3
Commit Graph

51857 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
cb20ca14a3 Merge commit '2e81acc687e64d15dd93c74793060bb5a233f44d' 
* commit '2e81acc687e64d15dd93c74793060bb5a233f44d':
  x86inc: Fix number of operands for cmp* instructions
  af_channelmap: fix uninitialized variable use introduced in ba8efac977
  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>
 2013-04-11 11:20:55 +02:00
Michael Niedermayer
d7e8b3d831 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>
 2013-04-11 11:09:51 +02:00
Michael Niedermayer
44d4488301 Merge commit '8114c101607843a86960bd3e0e9c40487dc2a961' 
* commit '8114c101607843a86960bd3e0e9c40487dc2a961':
  lavfi: add avfilter_get_class().

Conflicts:
	libavfilter/avfilter.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-11 10:59:06 +02:00
Clément Bœsch
b89ce54e74 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().
 2013-04-11 10:48:58 +02:00
Michael Niedermayer
0965be00fe Merge commit '4d1f31ea44f82adfb2b712534d71e27233a4f785' 
* commit '4d1f31ea44f82adfb2b712534d71e27233a4f785':
  lavfi: make AVFilterContext export filter options.

Conflicts:
	libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-11 10:42:49 +02:00
Michael Niedermayer
c7b0a84e1f 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>
 2013-04-11 10:34:05 +02:00
Michael Niedermayer
31428240ec 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>
 2013-04-11 10:25:42 +02:00
Michael Niedermayer
ef29a95a4d 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>
 2013-04-11 10:02:07 +02:00
highgod0401
db2de94e95 avutil/opencl: add opencl device list APIs 20130411 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-11 03:48:57 +02:00
Michael Niedermayer
3a3d984445 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>
 2013-04-11 03:41:08 +02:00
Michael Niedermayer
670e0f7f66 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>
 2013-04-11 03:20:43 +02:00
Michael Niedermayer
8bafd83aaa 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>
 2013-04-11 03:10:43 +02:00
Michael Niedermayer
7f2198a2f1 Merge commit '73d5d405d424c06f3f354337cfdb24794932094d' 
* commit '73d5d405d424c06f3f354337cfdb24794932094d':
  split: switch to an AVOptions-based system.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-11 02:50:21 +02:00
Michael Niedermayer
ae6634da8b Merge commit 'b13623e184759f37348b8fdb1276b1bb408f3e59' 
* commit 'b13623e184759f37348b8fdb1276b1bb408f3e59':
  af_volume: switch to an AVOptions-based system.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-11 02:44:13 +02:00
Michael Niedermayer
8905a811b7 Merge remote-tracking branch 'richardpl/biquads' 
* richardpl/biquads:
  lavfi/biquads: switch to an AVOptions-based system

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-11 02:38:05 +02:00
Michael Niedermayer
42c70b3584 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>
 2013-04-11 02:37:43 +02:00
Paul B Mahol
e6067acc8d lavfi/biquads: switch to an AVOptions-based system 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-11 00:34:19 +00:00
Michael Niedermayer
5e5ef6e8ae 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>
 2013-04-11 02:31:14 +02:00
Paul B Mahol
7c79ec66b6 lavfi/framestep: remove request_frame hack 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-11 00:18:28 +00:00
Paul B Mahol
f77db72965 lavfi/framestep: switch to an AVOptions-based system 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-11 00:18:28 +00:00
Michael Niedermayer
f17651bd16 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>
 2013-04-11 02:17:28 +02:00
Michael Niedermayer
d9d7c54960 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>
 2013-04-11 02:10:12 +02:00
Michael Niedermayer
5714812237 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>
 2013-04-11 01:53:08 +02:00
Michael Niedermayer
ac217bda30 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>
 2013-04-11 01:42:28 +02:00
Matthieu Bouron
f43da3def7 lavfi/aphaser: switch to AVOption-based system 2013-04-11 01:37:57 +02:00
Michael Niedermayer
314be1933e 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>
 2013-04-11 01:32:08 +02:00
Matthieu Bouron
a5ce5ac9fb lavfi/apad: switch to AVOption-based system 2013-04-11 01:31:08 +02:00
Matthieu Bouron
2b17e58163 lavfi/afade: switch to AVOption-base system 2013-04-11 01:25:02 +02:00
Matthieu Bouron
6afed2aec1 lavfi/blend: switch to AVOption-based system 2013-04-11 01:25:02 +02:00
Michael Niedermayer
ab6091f8e2 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>
 2013-04-11 01:18:18 +02:00
Michael Niedermayer
8ac7090c23 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>
 2013-04-11 01:05:14 +02:00
Clément Bœsch
7668b6832d lavfi/idet: switch to an AVOptions-based system. 2013-04-11 01:04:45 +02:00
Clément Bœsch
b2d589188f lavfi/histogram: switch to an AVOptions-based system. 2013-04-11 01:04:45 +02:00
Clément Bœsch
d5226fc575 lavfi/stereo3d: switch to an AVOptions-based system. 2013-04-11 01:04:45 +02:00
Clément Bœsch
a689a6b698 lavfi/noise: switch to an AVOptions-based system. 2013-04-11 01:04:45 +02:00
Clément Bœsch
e4bd1db88e lavfi/histeq: switch to an AVOptions-based system. 2013-04-11 01:04:44 +02:00
Michael Niedermayer
72ce979f10 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>
 2013-04-11 01:03:08 +02:00
Michael Niedermayer
c2696dabbb 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>
 2013-04-11 01:02:07 +02:00
Matthieu Bouron
531158e6be lavfi/kerndeint: switch to AVOption-based system 2013-04-11 00:55:45 +02:00
Michael Niedermayer
b4ffc35e76 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>
 2013-04-11 00:37:32 +02:00
Michael Niedermayer
a4e0defa75 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>
 2013-04-11 00:33:31 +02:00
Matthieu Bouron
6f46403cb0 lavfi/il: switch to AVOption-based system 2013-04-11 00:31:25 +02:00
Clément Bœsch
4ecee69b20 lavfi/mptestsrc: switch to an AVOptions-based system. 2013-04-11 00:21:47 +02:00
Clément Bœsch
791da4706c lavfi/mandelbrot: switch to an AVOptions-based system. 2013-04-11 00:21:47 +02:00
Clément Bœsch
bd85fee914 lavfi/life: switch to an AVOptions-based system. 2013-04-11 00:21:47 +02:00
Clément Bœsch
169880e31d lavfi/cellauto: switch to an AVOptions-based system. 2013-04-11 00:21:47 +02:00
Stefano Sabatini
cff8f91ddf lavfi/decimate: switch to an AVOption-based system 2013-04-11 00:20:01 +02:00
Stefano Sabatini
2040b428b4 lavfi/field: switch to AVOption-based system 
Also remove mention to syntax explanation which is or will be redundant
and possibly confusing.
 2013-04-11 00:16:25 +02:00
Michael Niedermayer
6a2fb5b90c Merge commit 'ffea3b00c39caa8ad78456ae08c8353929974dfd' 
* commit 'ffea3b00c39caa8ad78456ae08c8353929974dfd':
  vf_settb: switch to an AVOptions-based system.

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-11 00:10:59 +02:00
Stefano Sabatini
8695d9de47 lavfi/smarblur: add missing newline at end of verbose message 2013-04-11 00:04:27 +02:00