1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Commit Graph

51757 Commits

Author SHA1 Message Date
Michael Niedermayer
1ee9eacaa4 Merge commit '7ed833d78ea661d619124fd898547a900f6480bc'
* commit '7ed833d78ea661d619124fd898547a900f6480bc':
  vf_gradfun: switch to an AVOptions-based system.

Conflicts:
	doc/filters.texi
	libavfilter/gradfun.h
	libavfilter/vf_gradfun.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 21:09:06 +02:00
Michael Niedermayer
85f115b5d8 Merge commit 'c334c113d4d9e9a41bc38a3e4458d7ab21010401'
* commit 'c334c113d4d9e9a41bc38a3e4458d7ab21010401':
  vf_scale: switch to an AVOptions-based system.

Conflicts:
	doc/filters.texi
	libavfilter/avfilter.c
	libavfilter/vf_scale.c

scale keeps using our shorthand system due to the alternative not
supporting the more complex syntactical things like 1 parameter
dimensions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 20:40:37 +02:00
Michael Niedermayer
da3f89988f Merge commit '5aa1a668cfae7f617e1a06efad20f87283badd8a'
* commit '5aa1a668cfae7f617e1a06efad20f87283badd8a':
  vf_frei0r: switch to an AVOptions-based system.

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 19:51:02 +02:00
Michael Niedermayer
9280fc7da1 vf_curves: add option to set all curves at once
Reviewed-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 19:29:11 +02:00
Michael Niedermayer
81c1ed748b Merge commit 'f13ab29925883b4245da4129694af3af378d67be'
* commit 'f13ab29925883b4245da4129694af3af378d67be':
  vf_fps: switch to an AVOptions-based system.

Conflicts:
	libavfilter/vf_fps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 19:21:59 +02:00
Michael Niedermayer
b8a1f8b4e2 Merge commit 'a39c154049a2d0c4fb02a5c74f58d6986ec21cec'
* commit 'a39c154049a2d0c4fb02a5c74f58d6986ec21cec':
  vf_fieldorder: switch to an AVOptions-based system.

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 19:03:30 +02:00
Michael Niedermayer
0c3d706bdb Merge commit 'b9dfee9fa259dfc885508179a359dccc9e7840bd'
* commit 'b9dfee9fa259dfc885508179a359dccc9e7840bd':
  vf_fade: switch to an AVOptions-based system.

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 18:48:07 +02:00
Michael Niedermayer
d70b494422 Merge commit '8ec464c61c46a5d088b43d24e384d6c37b7ef14a'
* commit '8ec464c61c46a5d088b43d24e384d6c37b7ef14a':
  vf_drawtext: switch to an AVOptions-based system.

Conflicts:
	libavfilter/vf_drawtext.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 18:31:14 +02:00
Michael Niedermayer
0726d516dc Merge commit '335c31293baec6e6cf5907bd29840af3de8ff735'
* commit '335c31293baec6e6cf5907bd29840af3de8ff735':
  vf_drawbox: switch to an AVOptions-based system.

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 18:11:15 +02:00
Stefano Sabatini
215ca86475 doc/filters: review introductory example and explanation
In particular, fix wrong vertical mirroring command, and clarify
and extend explanation.

Based on a patch by littlebat <dashing.meng@gmail.com>.

Should fix trac ticket #2413.
2013-04-10 18:02:00 +02:00
Stefano Sabatini
e62fca11a8 lavfi/amerge: drop duplicated "Buffer queue overflow" message
The same message is shown already by the called function
ff_bufqueue_is_full().
2013-04-10 18:02:00 +02:00
Stefano Sabatini
270217908b ffmpeg: update error message, and make use of av_err2str() to simplify 2013-04-10 18:02:00 +02:00
Michael Niedermayer
eebe0b0224 Merge commit '63e58c55c17d7f8b5eec9c082fe0f8edc305a24e'
* commit '63e58c55c17d7f8b5eec9c082fe0f8edc305a24e':
  vf_delogo: switch to an AVOptions-based system.

Conflicts:
	libavfilter/vf_delogo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 17:54:20 +02:00
Michael Niedermayer
1c3cdf533b Merge commit '460e7b4f6d473d9f03ed45501221f9cb209b28fd'
* commit '460e7b4f6d473d9f03ed45501221f9cb209b28fd':
  vf_cropdetect: switch to an AVOptions-based system.

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 17:36:29 +02:00
Michael Niedermayer
200e04c70f Merge commit 'fba0156af77b11ec99edf4ee8f511b7aaa6b1891'
* commit 'fba0156af77b11ec99edf4ee8f511b7aaa6b1891':
  vf_crop: switch to an AVOptions-based system.

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 16:56:33 +02:00
Michael Niedermayer
eb6d58d23c Merge commit '51def31dbe5b6e857536de8fa428f263d64f3ae5'
* commit '51def31dbe5b6e857536de8fa428f263d64f3ae5':
  vf_boxblur: switch to an AVOptions-based system.

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 16:34:44 +02:00
Michael Niedermayer
a3cb303a4c avfilter/blackframe: add "thres" back as alternative
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 15:48:41 +02:00
Michael Niedermayer
90efdf98b1 avfilter: support alternative keys in the alternative shorthand system
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 15:47:18 +02:00
Michael Niedermayer
43bac121d3 Merge commit '62dcdb028cc84845fd263bb09304c4c6500bda7a'
* commit '62dcdb028cc84845fd263bb09304c4c6500bda7a':
  vf_blackframe: switch to an AVOptions-based system.
  vf_aspect: switch to an AVOptions-based system.

Conflicts:
	doc/filters.texi
	libavfilter/vf_aspect.c
	libavfilter/vf_blackframe.c

In the aspect filter most changes are merged but not the final
switch to the libav API because that is too restrictive and has
difficulty handling the syntax.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 15:37:21 +02:00
Michael Niedermayer
2a2a643c90 Merge commit 'e67a87eac814c7805d18c983c43033a8a1bd62af'
* commit 'e67a87eac814c7805d18c983c43033a8a1bd62af':
  vf_(no)format: switch to an AVOptions-based system.
  af_aformat: switch to an AVOptions-based system.

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 13:59:45 +02:00
Michael Niedermayer
451315830a Merge commit 'd28cb849899abd98bf2dd72f5a3dd56d441aeb27'
* commit 'd28cb849899abd98bf2dd72f5a3dd56d441aeb27':
  buffersrc: switch to an AVOptions-based system.

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

Commit not merged, merge left to maintainer.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 13:43:19 +02:00
Michael Niedermayer
828044aca2 Merge commit '4fa1f52e33b70029e2b621852f3af7c1ef9aecff'
* commit '4fa1f52e33b70029e2b621852f3af7c1ef9aecff':
  af_resample: switch to an AVOptions-based system.

Conflicts:
	libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 13:30:17 +02:00
Stefano Sabatini
d2752ef061 lavfi/overlay: add process_command callback 2013-04-10 13:11:27 +02:00
Stefano Sabatini
006e20bd36 lavfi/overlay: add enable expression
This expression is useful to enable/disable overlaying on the fly.

Note that this can't be easily done relying on the filtergraph structure,
since this implies caching issues or a null frame overlaying in the best
case, which is better avoided for performance and convenience reasons.
2013-04-10 13:11:27 +02:00
Stefano Sabatini
cc3edd99a6 lavfi/overlay: add dynamic expression evaluation support
Add support for dynamic x, y expressions evaluation.

Also add support for an evaluation mode which allows to disable per-frame
evaluation, so that there is no speedloss in case the expression does not
depend on frame variables.
2013-04-10 13:11:27 +02:00
Stefano Sabatini
8afcaaeb75 lavu/eval: rename "new_eval_expr()" to "make_eval_expr()"
The new name is more semantically and stilistically consistent.
2013-04-10 13:11:27 +02:00
Michael Niedermayer
0594ef0dea Merge commit 'b439c992c23f3e0f3832fffd2a34a664b236c525'
* commit 'b439c992c23f3e0f3832fffd2a34a664b236c525':
  lavfi: switch to an AVOptions-based system.
  dfa: implement missing TDLT coding method

Conflicts:
	libavcodec/dfa.c
	libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 12:41:06 +02:00
Clément Bœsch
2a7f885fe1 lavf: add libquvi demuxer. 2013-04-10 12:09:20 +02:00
James Almer
89388a953a Replace all occurrences of PRI in sscanf() calls with SCN
Signed-off-by: James Almer <jamrial@gmail.com>
2013-04-10 09:56:48 +02:00
Christophe Gisquet
2383068cbf x86: sbrdsp: implement SSE2 qmf_pre_shuffle
From 253 to 51 cycles on Arrandale and Win64.
44 cycles on SandyBridge.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 02:42:22 +02:00
Clément Bœsch
d2e051e30c lavfi/separatefields: adjust tb to avoid rounding errors.
Since the PTS need double accuracy, the timebase denominator is doubled
as well, and this new time base is used for the timestamp unit.
2013-04-10 02:38:54 +02:00
d s
685617ac29 avformat/avisynth: Cosmetics
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 02:25:34 +02:00
d s
ca3cef719e avformat/avisynth: Fix off-by-one error in avisynth demuxer.
Fixes ticket #2412.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 02:25:34 +02:00
Paul B Mahol
d0073c7a0b separatefields filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-10 00:08:57 +00:00
Michael Niedermayer
f1c0c6b7de Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
  ffmpeg: use a rational for -aspect option.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 01:49:39 +02:00
Michael Niedermayer
6a78ec180e ffmpeg: print frame decoding error statistic
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 01:47:03 +02:00
Michael Niedermayer
eedcac68f3 ffmpeg: dont exit 0 if fewer than 1/3 of the input could be decoded.
Fixes Ticket2405

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 01:40:06 +02:00
Michael Niedermayer
62a1181015 h264: wait for missing slices only on frames
The EC code does not support fields currently thus it makes no
sense to wait for these cases (which also the check doesnt handle
correctly)

Fixes Ticket 2454

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-09 23:12:24 +02:00
Clément Bœsch
1043cb8e80 lavc/ass: use bprint API in ff_ass_add_rect(). 2013-04-09 21:43:44 +02:00
Nicolas George
de38e7c8c3 ffmpeg: use a rational for -aspect option. 2013-04-09 20:16:20 +02:00
Anton Khirnov
7ed833d78e vf_gradfun: switch to an AVOptions-based system. 2013-04-09 19:04:57 +02:00
Anton Khirnov
c334c113d4 vf_scale: switch to an AVOptions-based system. 2013-04-09 19:04:45 +02:00
Anton Khirnov
5aa1a668cf vf_frei0r: switch to an AVOptions-based system. 2013-04-09 19:04:28 +02:00
Anton Khirnov
f13ab29925 vf_fps: switch to an AVOptions-based system. 2013-04-09 19:04:15 +02:00
Anton Khirnov
a39c154049 vf_fieldorder: switch to an AVOptions-based system. 2013-04-09 19:03:56 +02:00
Anton Khirnov
b9dfee9fa2 vf_fade: switch to an AVOptions-based system. 2013-04-09 19:03:43 +02:00
Anton Khirnov
8ec464c61c vf_drawtext: switch to an AVOptions-based system. 2013-04-09 19:03:23 +02:00
Anton Khirnov
335c31293b vf_drawbox: switch to an AVOptions-based system. 2013-04-09 19:03:08 +02:00
Anton Khirnov
63e58c55c1 vf_delogo: switch to an AVOptions-based system. 2013-04-09 19:02:43 +02:00
Anton Khirnov
460e7b4f6d vf_cropdetect: switch to an AVOptions-based system. 2013-04-09 19:02:32 +02:00