ffmpeg.git
7 years agolavfi/life: switch to an AVOptions-based system.
Clément Bœsch [Wed, 10 Apr 2013 21:24:05 +0000 (23:24 +0200)]
lavfi/life: switch to an AVOptions-based system.

7 years agolavfi/cellauto: switch to an AVOptions-based system.
Clément Bœsch [Wed, 10 Apr 2013 21:21:21 +0000 (23:21 +0200)]
lavfi/cellauto: switch to an AVOptions-based system.

7 years agolavfi/field: switch to AVOption-based system
Stefano Sabatini [Wed, 10 Apr 2013 22:14:06 +0000 (00:14 +0200)]
lavfi/field: switch to AVOption-based system

Also remove mention to syntax explanation which is or will be redundant
and possibly confusing.

7 years agoMerge commit 'ffea3b00c39caa8ad78456ae08c8353929974dfd'
Michael Niedermayer [Wed, 10 Apr 2013 22:10:59 +0000 (00:10 +0200)]
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>
7 years agolavfi/smarblur: add missing newline at end of verbose message
Stefano Sabatini [Wed, 10 Apr 2013 22:03:47 +0000 (00:03 +0200)]
lavfi/smarblur: add missing newline at end of verbose message

7 years agolavfi/smartblur: switch to AVOption-based system
Stefano Sabatini [Wed, 10 Apr 2013 22:02:27 +0000 (00:02 +0200)]
lavfi/smartblur: switch to AVOption-based system

7 years agoMerge commit '33b97faaba2744f0a2fd65c0ef9ecc2de3fad7ff'
Michael Niedermayer [Wed, 10 Apr 2013 21:48:26 +0000 (23:48 +0200)]
Merge commit '33b97faaba2744f0a2fd65c0ef9ecc2de3fad7ff'

* commit '33b97faaba2744f0a2fd65c0ef9ecc2de3fad7ff':
  vf_setpts: switch to an AVOptions-based system.

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'ubitux/shorthand-cleanup'
Michael Niedermayer [Wed, 10 Apr 2013 21:28:51 +0000 (23:28 +0200)]
Merge remote-tracking branch 'ubitux/shorthand-cleanup'

* ubitux/shorthand-cleanup:
  lavfi/subtitles: switch to an AVOptions-based system.
  lavfi/pp: switch to an AVOptions-based system.
  lavfi/geq: switch to an AVOptions-based system.
  lavfi/edgedetect: switch to an AVOptions-based system.
  lavfi/curves: switch to an AVOptions-based system.
  lavfi/colormatrix: switch to an AVOptions-based system.
  lavfi/perms: switch to an AVOptions-based system.
  lavfi/ebur128: switch to an AVOptions-based system.
  lavfi/showspectrum: switch to an AVOptions-based system.
  lavfi/silencedetect: switch to an AVOptions-based system.
  lavfi/thumbnail: switch to an AVOptions-based system.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '95f1f56a21bc2f824af6fb97ca7ab35cdd0c401e'
Michael Niedermayer [Wed, 10 Apr 2013 21:18:18 +0000 (23:18 +0200)]
Merge commit '95f1f56a21bc2f824af6fb97ca7ab35cdd0c401e'

* commit '95f1f56a21bc2f824af6fb97ca7ab35cdd0c401e':
  vf_select: switch to an AVOptions-based system.

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/subtitles: switch to an AVOptions-based system.
Clément Bœsch [Wed, 10 Apr 2013 21:10:05 +0000 (23:10 +0200)]
lavfi/subtitles: switch to an AVOptions-based system.

7 years agolavfi/pp: switch to an AVOptions-based system.
Clément Bœsch [Wed, 10 Apr 2013 20:43:25 +0000 (22:43 +0200)]
lavfi/pp: switch to an AVOptions-based system.

Also add and use the '|' separator instead of ':' since it's
incompatible with the new option system...

7 years agolavfi/geq: switch to an AVOptions-based system.
Clément Bœsch [Wed, 10 Apr 2013 20:33:41 +0000 (22:33 +0200)]
lavfi/geq: switch to an AVOptions-based system.

7 years agolavfi/edgedetect: switch to an AVOptions-based system.
Clément Bœsch [Wed, 10 Apr 2013 20:28:37 +0000 (22:28 +0200)]
lavfi/edgedetect: switch to an AVOptions-based system.

7 years agolavfi/curves: switch to an AVOptions-based system.
Clément Bœsch [Wed, 10 Apr 2013 20:26:06 +0000 (22:26 +0200)]
lavfi/curves: switch to an AVOptions-based system.

7 years agolavfi/colormatrix: switch to an AVOptions-based system.
Clément Bœsch [Wed, 10 Apr 2013 20:18:20 +0000 (22:18 +0200)]
lavfi/colormatrix: switch to an AVOptions-based system.

7 years agolavfi/perms: switch to an AVOptions-based system.
Clément Bœsch [Wed, 10 Apr 2013 20:15:10 +0000 (22:15 +0200)]
lavfi/perms: switch to an AVOptions-based system.

7 years agolavfi/ebur128: switch to an AVOptions-based system.
Clément Bœsch [Wed, 10 Apr 2013 20:13:12 +0000 (22:13 +0200)]
lavfi/ebur128: switch to an AVOptions-based system.

7 years agolavfi/showspectrum: switch to an AVOptions-based system.
Clément Bœsch [Wed, 10 Apr 2013 20:10:56 +0000 (22:10 +0200)]
lavfi/showspectrum: switch to an AVOptions-based system.

7 years agolavfi/silencedetect: switch to an AVOptions-based system.
Clément Bœsch [Wed, 10 Apr 2013 20:05:12 +0000 (22:05 +0200)]
lavfi/silencedetect: switch to an AVOptions-based system.

7 years agolavfi/thumbnail: switch to an AVOptions-based system.
Clément Bœsch [Wed, 10 Apr 2013 19:57:07 +0000 (21:57 +0200)]
lavfi/thumbnail: switch to an AVOptions-based system.

7 years agoMerge commit '40c885c589808455a1c4b473509f1e6cd4908f55'
Michael Niedermayer [Wed, 10 Apr 2013 20:50:32 +0000 (22:50 +0200)]
Merge commit '40c885c589808455a1c4b473509f1e6cd4908f55'

* commit '40c885c589808455a1c4b473509f1e6cd4908f55':
  vf_pad: switch to an AVOptions-based system.

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/overlay: remove dupe initializer
Paul B Mahol [Wed, 10 Apr 2013 20:44:11 +0000 (20:44 +0000)]
lavfi/overlay: remove dupe initializer

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoMerge commit '9087eaf193b8ce99c41352064a81916fa66adb49'
Michael Niedermayer [Wed, 10 Apr 2013 20:26:01 +0000 (22:26 +0200)]
Merge commit '9087eaf193b8ce99c41352064a81916fa66adb49'

* commit '9087eaf193b8ce99c41352064a81916fa66adb49':
  vf_overlay: switch to an AVOptions-based system.

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '20b46f8f4fff6aeeab9ea418dc359eda8887ced6'
Michael Niedermayer [Wed, 10 Apr 2013 19:54:13 +0000 (21:54 +0200)]
Merge commit '20b46f8f4fff6aeeab9ea418dc359eda8887ced6'

* commit '20b46f8f4fff6aeeab9ea418dc359eda8887ced6':
  vf_lut: switch to an AVOptions-based system.

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'ee0e8d4b15a87932ab6066cd6eae3cab08726319'
Michael Niedermayer [Wed, 10 Apr 2013 19:24:00 +0000 (21:24 +0200)]
Merge commit 'ee0e8d4b15a87932ab6066cd6eae3cab08726319'

* commit 'ee0e8d4b15a87932ab6066cd6eae3cab08726319':
  vf_libopencv: switch to an AVOptions-based system.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '8c747d46f721cffa8ea51990805ad1d3a3a4fd0a'
Michael Niedermayer [Wed, 10 Apr 2013 19:13:27 +0000 (21:13 +0200)]
Merge commit '8c747d46f721cffa8ea51990805ad1d3a3a4fd0a'

* commit '8c747d46f721cffa8ea51990805ad1d3a3a4fd0a':
  vf_hqdn3d: switch to an AVOptions-based system.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '7ed833d78ea661d619124fd898547a900f6480bc'
Michael Niedermayer [Wed, 10 Apr 2013 18:48:46 +0000 (20:48 +0200)]
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>
7 years agoMerge commit 'c334c113d4d9e9a41bc38a3e4458d7ab21010401'
Michael Niedermayer [Wed, 10 Apr 2013 18:29:25 +0000 (20:29 +0200)]
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>
7 years agoMerge commit '5aa1a668cfae7f617e1a06efad20f87283badd8a'
Michael Niedermayer [Wed, 10 Apr 2013 17:51:02 +0000 (19:51 +0200)]
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>
7 years agovf_curves: add option to set all curves at once
Michael Niedermayer [Tue, 9 Apr 2013 21:04:24 +0000 (23:04 +0200)]
vf_curves: add option to set all curves at once

Reviewed-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'f13ab29925883b4245da4129694af3af378d67be'
Michael Niedermayer [Wed, 10 Apr 2013 17:21:59 +0000 (19:21 +0200)]
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>
7 years agoMerge commit 'a39c154049a2d0c4fb02a5c74f58d6986ec21cec'
Michael Niedermayer [Wed, 10 Apr 2013 17:02:13 +0000 (19:02 +0200)]
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>
7 years agoMerge commit 'b9dfee9fa259dfc885508179a359dccc9e7840bd'
Michael Niedermayer [Wed, 10 Apr 2013 16:48:07 +0000 (18:48 +0200)]
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>
7 years agoMerge commit '8ec464c61c46a5d088b43d24e384d6c37b7ef14a'
Michael Niedermayer [Wed, 10 Apr 2013 16:27:40 +0000 (18:27 +0200)]
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>
7 years agoMerge commit '335c31293baec6e6cf5907bd29840af3de8ff735'
Michael Niedermayer [Wed, 10 Apr 2013 16:11:15 +0000 (18:11 +0200)]
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>
7 years agodoc/filters: review introductory example and explanation
Stefano Sabatini [Fri, 5 Apr 2013 23:43:01 +0000 (01:43 +0200)]
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.

7 years agolavfi/amerge: drop duplicated "Buffer queue overflow" message
Stefano Sabatini [Sat, 30 Mar 2013 23:23:43 +0000 (00:23 +0100)]
lavfi/amerge: drop duplicated "Buffer queue overflow" message

The same message is shown already by the called function
ff_bufqueue_is_full().

7 years agoffmpeg: update error message, and make use of av_err2str() to simplify
Stefano Sabatini [Mon, 18 Mar 2013 11:18:56 +0000 (12:18 +0100)]
ffmpeg: update error message, and make use of av_err2str() to simplify

7 years agoMerge commit '63e58c55c17d7f8b5eec9c082fe0f8edc305a24e'
Michael Niedermayer [Wed, 10 Apr 2013 15:49:13 +0000 (17:49 +0200)]
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>
7 years agoMerge commit '460e7b4f6d473d9f03ed45501221f9cb209b28fd'
Michael Niedermayer [Wed, 10 Apr 2013 15:13:29 +0000 (17:13 +0200)]
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>
7 years agoMerge commit 'fba0156af77b11ec99edf4ee8f511b7aaa6b1891'
Michael Niedermayer [Wed, 10 Apr 2013 14:56:33 +0000 (16:56 +0200)]
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>
7 years agoMerge commit '51def31dbe5b6e857536de8fa428f263d64f3ae5'
Michael Niedermayer [Wed, 10 Apr 2013 14:28:23 +0000 (16:28 +0200)]
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>
7 years agoavfilter/blackframe: add "thres" back as alternative
Michael Niedermayer [Wed, 10 Apr 2013 13:48:02 +0000 (15:48 +0200)]
avfilter/blackframe: add "thres" back as alternative

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter: support alternative keys in the alternative shorthand system
Michael Niedermayer [Wed, 10 Apr 2013 13:47:18 +0000 (15:47 +0200)]
avfilter: support alternative keys in the alternative shorthand system

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '62dcdb028cc84845fd263bb09304c4c6500bda7a'
Michael Niedermayer [Wed, 10 Apr 2013 13:27:40 +0000 (15:27 +0200)]
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>
7 years agoMerge commit 'e67a87eac814c7805d18c983c43033a8a1bd62af'
Michael Niedermayer [Wed, 10 Apr 2013 11:52:53 +0000 (13:52 +0200)]
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>
7 years agoMerge commit 'd28cb849899abd98bf2dd72f5a3dd56d441aeb27'
Michael Niedermayer [Wed, 10 Apr 2013 11:43:19 +0000 (13:43 +0200)]
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>
7 years agoMerge commit '4fa1f52e33b70029e2b621852f3af7c1ef9aecff'
Michael Niedermayer [Wed, 10 Apr 2013 11:27:33 +0000 (13:27 +0200)]
Merge commit '4fa1f52e33b70029e2b621852f3af7c1ef9aecff'

* commit '4fa1f52e33b70029e2b621852f3af7c1ef9aecff':
  af_resample: switch to an AVOptions-based system.

Conflicts:
libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/overlay: add process_command callback
Stefano Sabatini [Tue, 19 Feb 2013 23:15:36 +0000 (00:15 +0100)]
lavfi/overlay: add process_command callback

7 years agolavfi/overlay: add enable expression
Stefano Sabatini [Mon, 8 Apr 2013 10:22:48 +0000 (12:22 +0200)]
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.

7 years agolavfi/overlay: add dynamic expression evaluation support
Stefano Sabatini [Tue, 19 Feb 2013 19:10:02 +0000 (20:10 +0100)]
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.

7 years agolavu/eval: rename "new_eval_expr()" to "make_eval_expr()"
Stefano Sabatini [Tue, 5 Mar 2013 12:46:57 +0000 (13:46 +0100)]
lavu/eval: rename "new_eval_expr()" to "make_eval_expr()"

The new name is more semantically and stilistically consistent.

7 years agoMerge commit 'b439c992c23f3e0f3832fffd2a34a664b236c525'
Michael Niedermayer [Wed, 10 Apr 2013 10:41:06 +0000 (12:41 +0200)]
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>
7 years agolavf: add libquvi demuxer.
Clément Bœsch [Thu, 4 Apr 2013 06:22:32 +0000 (08:22 +0200)]
lavf: add libquvi demuxer.

7 years agoReplace all occurrences of PRI in sscanf() calls with SCN
James Almer [Wed, 10 Apr 2013 07:52:08 +0000 (04:52 -0300)]
Replace all occurrences of PRI in sscanf() calls with SCN

Signed-off-by: James Almer <jamrial@gmail.com>
7 years agox86: sbrdsp: implement SSE2 qmf_pre_shuffle
Christophe Gisquet [Tue, 9 Apr 2013 22:54:25 +0000 (22:54 +0000)]
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>
7 years agolavfi/separatefields: adjust tb to avoid rounding errors.
Clément Bœsch [Wed, 10 Apr 2013 00:38:07 +0000 (02:38 +0200)]
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.

7 years agoavformat/avisynth: Cosmetics
d s [Tue, 9 Apr 2013 22:38:27 +0000 (15:38 -0700)]
avformat/avisynth: Cosmetics

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/avisynth: Fix off-by-one error in avisynth demuxer.
d s [Tue, 9 Apr 2013 22:36:58 +0000 (15:36 -0700)]
avformat/avisynth: Fix off-by-one error in avisynth demuxer.

Fixes ticket #2412.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoseparatefields filter
Paul B Mahol [Tue, 9 Apr 2013 15:35:23 +0000 (15:35 +0000)]
separatefields filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoMerge remote-tracking branch 'cigaes/master'
Michael Niedermayer [Tue, 9 Apr 2013 23:49:08 +0000 (01:49 +0200)]
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  ffmpeg: use a rational for -aspect option.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: print frame decoding error statistic
Michael Niedermayer [Tue, 9 Apr 2013 23:47:03 +0000 (01:47 +0200)]
ffmpeg: print frame decoding error statistic

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: dont exit 0 if fewer than 1/3 of the input could be decoded.
Michael Niedermayer [Tue, 9 Apr 2013 23:10:06 +0000 (01:10 +0200)]
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>
7 years agoh264: wait for missing slices only on frames
Michael Niedermayer [Tue, 9 Apr 2013 21:11:06 +0000 (23:11 +0200)]
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>
7 years agolavc/ass: use bprint API in ff_ass_add_rect().
Clément Bœsch [Tue, 9 Apr 2013 19:43:44 +0000 (21:43 +0200)]
lavc/ass: use bprint API in ff_ass_add_rect().

7 years agoffmpeg: use a rational for -aspect option.
Nicolas George [Tue, 9 Apr 2013 09:43:08 +0000 (11:43 +0200)]
ffmpeg: use a rational for -aspect option.

7 years agovf_settb: switch to an AVOptions-based system.
Anton Khirnov [Mon, 25 Feb 2013 20:21:29 +0000 (21:21 +0100)]
vf_settb: switch to an AVOptions-based system.

7 years agovf_setpts: switch to an AVOptions-based system.
Anton Khirnov [Mon, 25 Feb 2013 20:21:29 +0000 (21:21 +0100)]
vf_setpts: switch to an AVOptions-based system.

7 years agovf_select: switch to an AVOptions-based system.
Anton Khirnov [Mon, 25 Feb 2013 20:21:29 +0000 (21:21 +0100)]
vf_select: switch to an AVOptions-based system.

7 years agovf_pad: switch to an AVOptions-based system.
Anton Khirnov [Mon, 25 Feb 2013 20:21:29 +0000 (21:21 +0100)]
vf_pad: switch to an AVOptions-based system.

7 years agovf_overlay: switch to an AVOptions-based system.
Anton Khirnov [Mon, 25 Feb 2013 20:21:29 +0000 (21:21 +0100)]
vf_overlay: switch to an AVOptions-based system.

7 years agovf_lut: switch to an AVOptions-based system.
Anton Khirnov [Mon, 25 Feb 2013 20:21:29 +0000 (21:21 +0100)]
vf_lut: switch to an AVOptions-based system.

7 years agovf_libopencv: switch to an AVOptions-based system.
Anton Khirnov [Mon, 25 Feb 2013 20:21:29 +0000 (21:21 +0100)]
vf_libopencv: switch to an AVOptions-based system.

7 years agovf_hqdn3d: switch to an AVOptions-based system.
Anton Khirnov [Mon, 25 Feb 2013 20:21:29 +0000 (21:21 +0100)]
vf_hqdn3d: switch to an AVOptions-based system.

7 years agovf_gradfun: switch to an AVOptions-based system.
Anton Khirnov [Mon, 25 Feb 2013 20:21:29 +0000 (21:21 +0100)]
vf_gradfun: switch to an AVOptions-based system.

7 years agovf_scale: switch to an AVOptions-based system.
Anton Khirnov [Mon, 25 Feb 2013 20:21:29 +0000 (21:21 +0100)]
vf_scale: switch to an AVOptions-based system.

7 years agovf_frei0r: switch to an AVOptions-based system.
Anton Khirnov [Mon, 25 Feb 2013 20:21:29 +0000 (21:21 +0100)]
vf_frei0r: switch to an AVOptions-based system.

7 years agovf_fps: switch to an AVOptions-based system.
Anton Khirnov [Mon, 25 Feb 2013 20:21:29 +0000 (21:21 +0100)]
vf_fps: switch to an AVOptions-based system.

7 years agovf_fieldorder: switch to an AVOptions-based system.
Anton Khirnov [Mon, 25 Feb 2013 20:21:29 +0000 (21:21 +0100)]
vf_fieldorder: switch to an AVOptions-based system.

7 years agovf_fade: switch to an AVOptions-based system.
Anton Khirnov [Mon, 25 Feb 2013 20:21:29 +0000 (21:21 +0100)]
vf_fade: switch to an AVOptions-based system.

7 years agovf_drawtext: switch to an AVOptions-based system.
Anton Khirnov [Mon, 25 Feb 2013 20:21:29 +0000 (21:21 +0100)]
vf_drawtext: switch to an AVOptions-based system.

7 years agovf_drawbox: switch to an AVOptions-based system.
Anton Khirnov [Mon, 25 Feb 2013 20:21:29 +0000 (21:21 +0100)]
vf_drawbox: switch to an AVOptions-based system.

7 years agovf_delogo: switch to an AVOptions-based system.
Anton Khirnov [Mon, 25 Feb 2013 20:21:29 +0000 (21:21 +0100)]
vf_delogo: switch to an AVOptions-based system.

7 years agovf_cropdetect: switch to an AVOptions-based system.
Anton Khirnov [Mon, 25 Feb 2013 20:21:29 +0000 (21:21 +0100)]
vf_cropdetect: switch to an AVOptions-based system.

7 years agovf_crop: switch to an AVOptions-based system.
Anton Khirnov [Mon, 25 Feb 2013 20:21:29 +0000 (21:21 +0100)]
vf_crop: switch to an AVOptions-based system.

7 years agovf_boxblur: switch to an AVOptions-based system.
Anton Khirnov [Mon, 25 Feb 2013 20:21:29 +0000 (21:21 +0100)]
vf_boxblur: switch to an AVOptions-based system.

7 years agovf_blackframe: switch to an AVOptions-based system.
Anton Khirnov [Mon, 25 Feb 2013 20:21:29 +0000 (21:21 +0100)]
vf_blackframe: switch to an AVOptions-based system.

7 years agovf_aspect: switch to an AVOptions-based system.
Anton Khirnov [Mon, 25 Feb 2013 20:21:29 +0000 (21:21 +0100)]
vf_aspect: switch to an AVOptions-based system.

7 years agovf_(no)format: switch to an AVOptions-based system.
Anton Khirnov [Mon, 25 Feb 2013 20:21:29 +0000 (21:21 +0100)]
vf_(no)format: switch to an AVOptions-based system.

7 years agoaf_aformat: switch to an AVOptions-based system.
Anton Khirnov [Mon, 25 Feb 2013 20:21:29 +0000 (21:21 +0100)]
af_aformat: switch to an AVOptions-based system.

7 years agobuffersrc: switch to an AVOptions-based system.
Anton Khirnov [Mon, 25 Feb 2013 20:21:29 +0000 (21:21 +0100)]
buffersrc: switch to an AVOptions-based system.

7 years agoaf_resample: switch to an AVOptions-based system.
Anton Khirnov [Mon, 25 Feb 2013 20:21:29 +0000 (21:21 +0100)]
af_resample: switch to an AVOptions-based system.

7 years agolavfi: switch to an AVOptions-based system.
Anton Khirnov [Mon, 25 Feb 2013 20:21:29 +0000 (21:21 +0100)]
lavfi: switch to an AVOptions-based system.

7 years agodfa: implement missing TDLT coding method
Kostya Shishkov [Mon, 8 Apr 2013 18:06:42 +0000 (20:06 +0200)]
dfa: implement missing TDLT coding method

7 years agomsmpeg4: ignore negative DC overflow
Michael Niedermayer [Tue, 9 Apr 2013 14:27:49 +0000 (16:27 +0200)]
msmpeg4: ignore negative DC overflow

Fixes second half of Ticket2414

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomsmpeg4: fix asm code in ff_msmpeg4_pred_dc()
Michael Niedermayer [Tue, 9 Apr 2013 14:25:12 +0000 (16:25 +0200)]
msmpeg4: fix asm code in ff_msmpeg4_pred_dc()

Fixes first half of Ticket2414

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 9 Apr 2013 09:36:35 +0000 (11:36 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  srtp: Include rtpdec.h for RTP_MAX_PACKET_LENGTH
  rtpdec: Increase max rtp packet size to 8192
  lavf: Use RTP_MAX_PACKET_LENGTH instead of 1500
  h264pred: Add a few missing const declarations for ff_cropTbl derived pointers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosrtp: Include rtpdec.h for RTP_MAX_PACKET_LENGTH
Martin Storsjö [Tue, 9 Apr 2013 08:56:55 +0000 (11:56 +0300)]
srtp: Include rtpdec.h for RTP_MAX_PACKET_LENGTH

This was missed from 350ad50b - this fixes building the fate-srtp
test.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agortpdec: Increase max rtp packet size to 8192
Andrew Van Til [Thu, 4 Apr 2013 23:46:50 +0000 (01:46 +0200)]
rtpdec: Increase max rtp packet size to 8192

This fixes connecting to "Ceton InfiniTV4 PCIe & USB".

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agolavf: Use RTP_MAX_PACKET_LENGTH instead of 1500
Andrew Van Til [Thu, 4 Apr 2013 23:45:52 +0000 (01:45 +0200)]
lavf: Use RTP_MAX_PACKET_LENGTH instead of 1500

Signed-off-by: Martin Storsjö <martin@martin.st>