ffmpeg.git
9 years agolavfi/show{spectrum,waves}: use ff_filter_frame().
Clément Bœsch [Thu, 29 Nov 2012 02:56:07 +0000 (03:56 +0100)]
lavfi/show{spectrum,waves}: use ff_filter_frame().

9 years agolsws: define version in SWScaler class
Stefano Sabatini [Wed, 28 Nov 2012 23:27:25 +0000 (00:27 +0100)]
lsws: define version in SWScaler class

The version number is useful to check the libavutil version against which
the library was compiled at run-time, which in turn may be useful to deal
with binary compatibility issues.

9 years agodoc/Makefile: rework component configuration logic
Stefano Sabatini [Wed, 28 Nov 2012 23:13:28 +0000 (00:13 +0100)]
doc/Makefile: rework component configuration logic

Only enable component manual when the corresponding library providing
the feature is enabled.

9 years agodoc/ffmpeg-codecs: add short description
Stefano Sabatini [Tue, 27 Nov 2012 23:22:21 +0000 (00:22 +0100)]
doc/ffmpeg-codecs: add short description

9 years agovsrc_mandelbrot: switch to filter_frame
Michael Niedermayer [Thu, 29 Nov 2012 04:28:36 +0000 (05:28 +0100)]
vsrc_mandelbrot: switch to filter_frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavfi/ebur128: use ff_filter_frame() everywhere.
Clément Bœsch [Thu, 29 Nov 2012 02:48:14 +0000 (03:48 +0100)]
lavfi/ebur128: use ff_filter_frame() everywhere.

9 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Thu, 29 Nov 2012 02:18:27 +0000 (03:18 +0100)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: increase maximum frame duration to 1 hour for streams without TS discontinuity
  ffplay: fix updating external clock after seeking
  ffplay: disallow seeking before the start of the file

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 29 Nov 2012 01:54:50 +0000 (02:54 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vf_fieldorder: require write permissions
  vf_fieldorder: reindent

Conflicts:
libavfilter/vf_fieldorder.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '565e4993c63f797e2d50ad2f1e8f62fdbe299666'
Michael Niedermayer [Thu, 29 Nov 2012 01:37:46 +0000 (02:37 +0100)]
Merge commit '565e4993c63f797e2d50ad2f1e8f62fdbe299666'

The commit has already been split and commited, this merge is just for metadata.
What has not been merged is the removial of some start/end_frame / draw_slice
related functions that are still in use. They can be removed once they are
unused.

* commit '565e4993c63f797e2d50ad2f1e8f62fdbe299666':
  lavfi: merge start_frame/draw_slice/end_frame

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavfi/ass: switch to filter_frame.
Clément Bœsch [Thu, 29 Nov 2012 01:34:09 +0000 (02:34 +0100)]
lavfi/ass: switch to filter_frame.

9 years agoavfilter: mark start_frame/end_frame/draw_slice as deprecated
Anton Khirnov [Thu, 29 Nov 2012 01:30:11 +0000 (02:30 +0100)]
avfilter: mark start_frame/end_frame/draw_slice as deprecated

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavfi/colormatrix: 10l fix forgotten buffer unref.
Clément Bœsch [Thu, 29 Nov 2012 01:21:16 +0000 (02:21 +0100)]
lavfi/colormatrix: 10l fix forgotten buffer unref.

9 years agolavfi/colormatrix: switch to filter_frame.
Clément Bœsch [Thu, 29 Nov 2012 01:04:45 +0000 (02:04 +0100)]
lavfi/colormatrix: switch to filter_frame.

9 years agovf_format: switch to filter_frame
Anton Khirnov [Thu, 29 Nov 2012 01:09:40 +0000 (02:09 +0100)]
vf_format: switch to filter_frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovf_copy: switch to filter_frame
Anton Khirnov [Thu, 29 Nov 2012 01:09:22 +0000 (02:09 +0100)]
vf_copy: switch to filter_frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovf_null: switch to filter_frame
Anton Khirnov [Thu, 29 Nov 2012 01:09:01 +0000 (02:09 +0100)]
vf_null: switch to filter_frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibavfilter: default to filter_frame when neither it nor start/slice/end is set.
Michael Niedermayer [Thu, 29 Nov 2012 01:03:20 +0000 (02:03 +0100)]
libavfilter: default to filter_frame when neither it nor start/slice/end is set.

this is needed for vf_null and a few others.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agobuffersrc: switch to filter_frame
Anton Khirnov [Thu, 29 Nov 2012 00:51:31 +0000 (01:51 +0100)]
buffersrc: switch to filter_frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agobuffersink: switch to filter_frame
Anton Khirnov [Thu, 29 Nov 2012 00:51:12 +0000 (01:51 +0100)]
buffersink: switch to filter_frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavfi/thumbnail: re-use ctx instead of inlink->dst.
Clément Bœsch [Thu, 29 Nov 2012 00:43:28 +0000 (01:43 +0100)]
lavfi/thumbnail: re-use ctx instead of inlink->dst.

9 years agolavfi/thumbnail: use avfilter_unref_bufferp() where appropriate.
Clément Bœsch [Thu, 29 Nov 2012 00:38:08 +0000 (01:38 +0100)]
lavfi/thumbnail: use avfilter_unref_bufferp() where appropriate.

9 years agolavfi/thumbnail: switch to filter_frame.
Clément Bœsch [Thu, 29 Nov 2012 00:33:25 +0000 (01:33 +0100)]
lavfi/thumbnail: switch to filter_frame.

9 years agolibavfilter/split: switch to filter_frame
Anton Khirnov [Thu, 29 Nov 2012 00:20:10 +0000 (01:20 +0100)]
libavfilter/split: switch to filter_frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovf_scale: switch to filter_frame
Michael Niedermayer [Thu, 29 Nov 2012 00:19:35 +0000 (01:19 +0100)]
vf_scale: switch to filter_frame

Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavfi/sendcmd: expose the options for both filters.
Clément Bœsch [Wed, 28 Nov 2012 23:13:47 +0000 (00:13 +0100)]
lavfi/sendcmd: expose the options for both filters.

9 years agolavfi/sendcmd: add FLAGS to AVOption array.
Clément Bœsch [Wed, 28 Nov 2012 23:13:29 +0000 (00:13 +0100)]
lavfi/sendcmd: add FLAGS to AVOption array.

9 years agolavfi: add priv_class for some forgotten filters.
Clément Bœsch [Wed, 28 Nov 2012 22:36:50 +0000 (23:36 +0100)]
lavfi: add priv_class for some forgotten filters.

This allows to print the options available when using commands such as
ffmpeg -help full.

9 years agolavfi/mptestsrc: add FLAGS to AVOption array.
Clément Bœsch [Wed, 28 Nov 2012 22:50:56 +0000 (23:50 +0100)]
lavfi/mptestsrc: add FLAGS to AVOption array.

9 years agovf_blackframe: switch to filter_frame
Anton Khirnov [Wed, 28 Nov 2012 23:32:08 +0000 (00:32 +0100)]
vf_blackframe: switch to filter_frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovf_aspect: switch to filter_frame
Anton Khirnov [Wed, 28 Nov 2012 23:31:50 +0000 (00:31 +0100)]
vf_aspect: switch to filter_frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovf_cropdetect: switch to filter_frame
Anton Khirnov [Wed, 28 Nov 2012 23:15:56 +0000 (00:15 +0100)]
vf_cropdetect: switch to filter_frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovf_crop: switch to filter_frame
Anton Khirnov [Wed, 28 Nov 2012 23:15:40 +0000 (00:15 +0100)]
vf_crop: switch to filter_frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovf_drawbox: switch to filter frame
Anton Khirnov [Wed, 28 Nov 2012 23:09:53 +0000 (00:09 +0100)]
vf_drawbox: switch to filter frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovflip: switch to filter_frame
Anton Khirnov [Wed, 28 Nov 2012 23:09:31 +0000 (00:09 +0100)]
vflip: switch to filter_frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'bb6c67bb36b136de10256f0999128df4a42f9ffc'
Michael Niedermayer [Wed, 28 Nov 2012 22:59:15 +0000 (23:59 +0100)]
Merge commit 'bb6c67bb36b136de10256f0999128df4a42f9ffc'

* commit 'bb6c67bb36b136de10256f0999128df4a42f9ffc':
  lavfi: remove vf_slicify

Conflicts:
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/vf_slicify.c
tests/lavfi-regression.sh
tests/ref/lavfi/crop_scale_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agodoc: add ffmpeg-bitstream-filters.texi file
Stefano Sabatini [Mon, 26 Nov 2012 22:58:40 +0000 (23:58 +0100)]
doc: add ffmpeg-bitstream-filters.texi file

9 years agovf_yadif: switch to filter_frame, this filter did not support slices
Anton Khirnov [Wed, 28 Nov 2012 22:46:17 +0000 (23:46 +0100)]
vf_yadif: switch to filter_frame, this filter did not support slices

signed-off-by: Michael Niedermayer <michaelni@gmx.at>

9 years agovf_fade: switch to filter_frame
Anton Khirnov [Wed, 28 Nov 2012 22:27:21 +0000 (23:27 +0100)]
vf_fade: switch to filter_frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavfi: convert remaining input/output list compound literals to named objects.
Clément Bœsch [Wed, 28 Nov 2012 19:01:59 +0000 (20:01 +0100)]
lavfi: convert remaining input/output list compound literals to named objects.

This is following 568c70e79ee267426c15ef4603c69703f6a5884a.

9 years agovf_lut: switch to filter_frame
Anton Khirnov [Wed, 28 Nov 2012 21:39:35 +0000 (22:39 +0100)]
vf_lut: switch to filter_frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovf_hflip: switch to filter_frame
Anton Khirnov [Wed, 28 Nov 2012 21:39:16 +0000 (22:39 +0100)]
vf_hflip: switch to filter_frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agof_setpts: switch to filter_frame
Anton Khirnov [Wed, 28 Nov 2012 21:27:51 +0000 (22:27 +0100)]
f_setpts: switch to filter_frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agof_settb: switch to filter_frame
Anton Khirnov [Wed, 28 Nov 2012 21:10:29 +0000 (22:10 +0100)]
f_settb: switch to filter_frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agosrc_movie: switch to filter_frame
Michael Niedermayer [Wed, 28 Nov 2012 20:58:45 +0000 (21:58 +0100)]
src_movie: switch to filter_frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovsrc_testsrc: switch to filter_frame
Anton Khirnov [Wed, 28 Nov 2012 20:53:56 +0000 (21:53 +0100)]
vsrc_testsrc: switch to filter_frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovsink_nullsink: switch to filter_frame
Anton Khirnov [Wed, 28 Nov 2012 20:49:04 +0000 (21:49 +0100)]
vsink_nullsink: switch to filter_frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovf_unsharp: switch to filter_frame, this filter did not support slices
Anton Khirnov [Wed, 28 Nov 2012 20:47:39 +0000 (21:47 +0100)]
vf_unsharp: switch to filter_frame, this filter did not support slices

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovf_transpose: switch to filter_frame
Michael Niedermayer [Wed, 28 Nov 2012 20:46:23 +0000 (21:46 +0100)]
vf_transpose: switch to filter_frame

Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffplay: increase maximum frame duration to 1 hour for streams without TS discontinuity
Marton Balint [Fri, 2 Nov 2012 23:30:20 +0000 (00:30 +0100)]
ffplay: increase maximum frame duration to 1 hour for streams without TS discontinuity

Partially fixes ticket #1707. A-V sync still needs some work after seeking...

Signed-off-by: Marton Balint <cus@passwd.hu>
9 years agoffplay: fix updating external clock after seeking
Marton Balint [Thu, 22 Nov 2012 23:23:11 +0000 (00:23 +0100)]
ffplay: fix updating external clock after seeking

Now it should work for the timestamp based and the byte based case as well.
Also only update the external clock if the seeking was successful.

Signed-off-by: Marton Balint <cus@passwd.hu>
9 years agoffplay: disallow seeking before the start of the file
Marton Balint [Thu, 22 Nov 2012 23:22:35 +0000 (00:22 +0100)]
ffplay: disallow seeking before the start of the file

In timestamp based seeking we update the external clock to the seek target,
therefore we should use sane timestamps even if libavformat could handle
seeking before the start of the file.

Signed-off-by: Marton Balint <cus@passwd.hu>
9 years agovf_select: switch to filter_frame
Anton Khirnov [Wed, 28 Nov 2012 20:02:09 +0000 (21:02 +0100)]
vf_select: switch to filter_frame

The new code reads the input frame when its ready, the previous
code did read the input frame during start_frame at which point it
may not yet be available.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovf_showinfo: switch to filter_frame
Anton Khirnov [Wed, 28 Nov 2012 20:10:06 +0000 (21:10 +0100)]
vf_showinfo: switch to filter_frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovf_pad: switch to filter_frame
Michael Niedermayer [Wed, 28 Nov 2012 19:48:42 +0000 (20:48 +0100)]
vf_pad: switch to filter_frame

Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoVivo demuxer
Daniel Verkamp [Wed, 21 Dec 2011 02:20:04 +0000 (02:20 +0000)]
Vivo demuxer

9 years agovf_pixdesctest: switch to filter_frame
Michael Niedermayer [Wed, 28 Nov 2012 19:18:27 +0000 (20:18 +0100)]
vf_pixdesctest: switch to filter_frame

Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovf_libopencv: switch to filter_frame, this filter did not support slices
Anton Khirnov [Wed, 28 Nov 2012 19:10:51 +0000 (20:10 +0100)]
vf_libopencv: switch to filter_frame, this filter did not support slices

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavfi/geq: switch to filter_frame.
Clément Bœsch [Wed, 28 Nov 2012 19:19:09 +0000 (20:19 +0100)]
lavfi/geq: switch to filter_frame.

9 years agovf_gradfun: switch to filter_frame, this filter did not support slices
Anton Khirnov [Wed, 28 Nov 2012 18:53:50 +0000 (19:53 +0100)]
vf_gradfun: switch to filter_frame, this filter did not support slices

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovf_frei0r: switch to filter_frame, the filter did not support slices
Anton Khirnov [Wed, 28 Nov 2012 18:45:48 +0000 (19:45 +0100)]
vf_frei0r: switch to filter_frame, the filter did not support slices

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavfi/edgedetect: switch to filter_frame.
Clément Bœsch [Wed, 28 Nov 2012 18:56:18 +0000 (19:56 +0100)]
lavfi/edgedetect: switch to filter_frame.

9 years agovf_fps: switch to filter_frame
Anton Khirnov [Wed, 28 Nov 2012 18:28:41 +0000 (19:28 +0100)]
vf_fps: switch to filter_frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovf_fieldorder: switch to filter_frame, this filter did not support real slices
Anton Khirnov [Wed, 28 Nov 2012 17:50:44 +0000 (18:50 +0100)]
vf_fieldorder: switch to filter_frame, this filter did not support real slices

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibavfilter/fifo: fix indent
Michael Niedermayer [Wed, 28 Nov 2012 18:13:51 +0000 (19:13 +0100)]
libavfilter/fifo: fix indent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovf_boxblur: cosmetics to reduce diff to qatar
Michael Niedermayer [Wed, 28 Nov 2012 18:12:42 +0000 (19:12 +0100)]
vf_boxblur: cosmetics to reduce diff to qatar

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovf_drawtext: switch to filter_frame, this filter did not support slices
Michael Niedermayer [Wed, 28 Nov 2012 17:07:51 +0000 (18:07 +0100)]
vf_drawtext: switch to filter_frame, this filter did not support slices

Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovf_delogo: switch to filter_frame, this filter did not support slices
Michael Niedermayer [Wed, 28 Nov 2012 17:05:40 +0000 (18:05 +0100)]
vf_delogo: switch to filter_frame, this filter did not support slices

Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovf_hqdn3d: fix permissions
Michael Niedermayer [Wed, 28 Nov 2012 17:05:09 +0000 (18:05 +0100)]
vf_hqdn3d: fix permissions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovf_delogo: fix order of operations in apply_delogo()
Michael Niedermayer [Wed, 28 Nov 2012 17:03:03 +0000 (18:03 +0100)]
vf_delogo: fix order of operations in apply_delogo()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovf_boxblur: switch to filter_frame, boxblur did not support slices
Anton Khirnov [Wed, 28 Nov 2012 16:33:07 +0000 (17:33 +0100)]
vf_boxblur: switch to filter_frame, boxblur did not support slices

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibavfilter/fifo: switch to filter_frame, the filter did not support slices.
Anton Khirnov [Wed, 28 Nov 2012 16:19:06 +0000 (17:19 +0100)]
libavfilter/fifo: switch to filter_frame, the filter did not support slices.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agopgssubdec: remove unused variable
Paul B Mahol [Wed, 28 Nov 2012 16:20:08 +0000 (16:20 +0000)]
pgssubdec: remove unused variable

Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years agoiff demuxer: 16SV support
Paul B Mahol [Wed, 28 Nov 2012 15:53:25 +0000 (15:53 +0000)]
iff demuxer: 16SV support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years agovf_hqdn3d: switch to filter_frame
Anton Khirnov [Wed, 28 Nov 2012 15:41:17 +0000 (16:41 +0100)]
vf_hqdn3d: switch to filter_frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibavfilter: update doxy for filter_frame
Michael Niedermayer [Wed, 28 Nov 2012 15:40:15 +0000 (16:40 +0100)]
libavfilter: update doxy for filter_frame

Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibavfilter: Support using filter_frame for video
Michael Niedermayer [Wed, 28 Nov 2012 15:39:04 +0000 (16:39 +0100)]
libavfilter: Support using filter_frame for video

With this we can mix filters using filter_frame OR start/draw_slice/end

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agodefault_filter_frame: fix argument name
Michael Niedermayer [Wed, 28 Nov 2012 15:36:18 +0000 (16:36 +0100)]
default_filter_frame: fix argument name

Based on code by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavfilter: check that filter_frame and slice variants are not both used
Michael Niedermayer [Wed, 28 Nov 2012 13:46:46 +0000 (14:46 +0100)]
avfilter: check that filter_frame and slice variants are not both used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavfi: replace filter_samples by filter_frame
Michael Niedermayer [Wed, 28 Nov 2012 12:53:48 +0000 (13:53 +0100)]
lavfi: replace filter_samples by filter_frame

Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovc1dec: add hacks to ensure static tables are initialized in open().
Reimar Döffinger [Tue, 27 Nov 2012 20:55:28 +0000 (21:55 +0100)]
vc1dec: add hacks to ensure static tables are initialized in open().

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
9 years agoUse err_out label for error-case cleanup.
Reimar Döffinger [Tue, 27 Nov 2012 20:10:12 +0000 (21:10 +0100)]
Use err_out label for error-case cleanup.

Will simplify future changes (introducing proper
locking around opening/closing parsers).

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
9 years agoatrac3: do not use init_static_data to init VLC data.
Reimar Döffinger [Tue, 27 Nov 2012 19:48:17 +0000 (20:48 +0100)]
atrac3: do not use init_static_data to init VLC data.

It would be called while registering the codec, which means
it needlessly wastes memory when it is never used.
Instead do the work when first opening the codec.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
9 years agoavrdec: implement seeking
Paul B Mahol [Wed, 28 Nov 2012 13:03:48 +0000 (13:03 +0000)]
avrdec: implement seeking

Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years agoMerge commit 'af7d13ee4a4bf8d708f9b0598abb8f6e22b76de1'
Michael Niedermayer [Wed, 28 Nov 2012 12:32:09 +0000 (13:32 +0100)]
Merge commit 'af7d13ee4a4bf8d708f9b0598abb8f6e22b76de1'

* commit 'af7d13ee4a4bf8d708f9b0598abb8f6e22b76de1':
  asink_nullsink: plug a memory leak.
  x86: h264_idct: port to cpuflags
  x86: cpu: Drop unused HAVE_RWEFLAGS condition

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'f5fa03660db16f9d78abc5a626438b4d0b54f563'
Michael Niedermayer [Wed, 28 Nov 2012 12:27:18 +0000 (13:27 +0100)]
Merge commit 'f5fa03660db16f9d78abc5a626438b4d0b54f563'

* commit 'f5fa03660db16f9d78abc5a626438b4d0b54f563':
  vble: Do not abort decoding when version is not 1
  lavr: do not pass consumed samples as a parameter to ff_audio_resample()
  lavr: correct the documentation for the ff_audio_resample() return value
  lavr: do not pass sample count as a parameter to ff_audio_convert()
  x86: h264_weight: port to cpuflags
  configure: Enable avconv filter dependencies automatically

Conflicts:
configure
libavcodec/x86/h264_weight.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavrdec: sample rate takes 3 bytes not 4
Paul B Mahol [Wed, 28 Nov 2012 11:02:22 +0000 (11:02 +0000)]
avrdec: sample rate takes 3 bytes not 4

Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years agoavrdec: fix typo in .long_name
Paul B Mahol [Wed, 28 Nov 2012 10:56:59 +0000 (10:56 +0000)]
avrdec: fix typo in .long_name

Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years agovf_fieldorder: require write permissions
Anton Khirnov [Tue, 27 Nov 2012 07:59:55 +0000 (08:59 +0100)]
vf_fieldorder: require write permissions

This filter modifies the input frame.

9 years agovf_fieldorder: reindent
Anton Khirnov [Tue, 27 Nov 2012 07:59:22 +0000 (08:59 +0100)]
vf_fieldorder: reindent

9 years agolavfi: merge start_frame/draw_slice/end_frame
Anton Khirnov [Tue, 27 Nov 2012 06:49:45 +0000 (07:49 +0100)]
lavfi: merge start_frame/draw_slice/end_frame

Any alleged performance benefits gained from the split are purely
mythological and do not justify added code complexity.

9 years agolavfi: remove vf_slicify
Anton Khirnov [Tue, 27 Nov 2012 09:41:22 +0000 (10:41 +0100)]
lavfi: remove vf_slicify

The following commit will make it useless.

The crop_scale_vflip FATE test changes because of off-by-one differences
in output when vflipped slices are passed to sws.

9 years agoasink_nullsink: plug a memory leak.
Anton Khirnov [Tue, 27 Nov 2012 10:35:55 +0000 (11:35 +0100)]
asink_nullsink: plug a memory leak.

9 years agoqpeg: reset palette on seeks
Michael Niedermayer [Wed, 28 Nov 2012 04:16:15 +0000 (05:16 +0100)]
qpeg: reset palette on seeks

Fixes Ticket1921

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agonut: put nut PCM audio tags in front of avi tags.
Michael Niedermayer [Wed, 28 Nov 2012 00:32:22 +0000 (01:32 +0100)]
nut: put nut PCM audio tags in front of avi tags.

This fixes correctly storing and identifying PCM in nut.

Based on patch by Luca Barbato
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agox86: h264_idct: port to cpuflags
Diego Biurrun [Sun, 15 Jul 2012 13:43:47 +0000 (15:43 +0200)]
x86: h264_idct: port to cpuflags

9 years agox86: cpu: Drop unused HAVE_RWEFLAGS condition
Diego Biurrun [Tue, 27 Nov 2012 18:47:34 +0000 (19:47 +0100)]
x86: cpu: Drop unused HAVE_RWEFLAGS condition

The test for rweflags was dropped in a previous commit.

9 years agodoc: add ffmpeg-protocols.texi manual
Stefano Sabatini [Mon, 26 Nov 2012 22:52:50 +0000 (23:52 +0100)]
doc: add ffmpeg-protocols.texi manual

9 years agodoc: move syntax and eval chapters from libavutil to ffmpeg-utils
Stefano Sabatini [Mon, 26 Nov 2012 22:47:56 +0000 (23:47 +0100)]
doc: move syntax and eval chapters from libavutil to ffmpeg-utils

Move utilities description to a dedicated manual, consistent with what I
did with the rest of the documentation.

9 years agodoc: add libavdevice.texi and ffmpeg-devices.texi files
Stefano Sabatini [Mon, 26 Nov 2012 22:38:32 +0000 (23:38 +0100)]
doc: add libavdevice.texi and ffmpeg-devices.texi files

9 years agodoc: add libavformat.texi and ffmpeg-formats.texi files
Stefano Sabatini [Sun, 18 Nov 2012 12:39:18 +0000 (13:39 +0100)]
doc: add libavformat.texi and ffmpeg-formats.texi files