ffmpeg.git
6 years agoxldec: return meaningful error code
Paul B Mahol [Sat, 1 Dec 2012 09:26:36 +0000 (09:26 +0000)]
xldec: return meaningful error code

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agomotionpixels: use meaningful error code
Paul B Mahol [Sat, 1 Dec 2012 09:18:21 +0000 (09:18 +0000)]
motionpixels: use meaningful error code

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agomvi: check av_mallocz() result
Paul B Mahol [Sat, 1 Dec 2012 09:03:24 +0000 (09:03 +0000)]
mvi: check av_mallocz() result

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoswscale: fix 12 and 14 bit YUV planar output with scaling.
Michael Niedermayer [Sat, 1 Dec 2012 02:31:48 +0000 (03:31 +0100)]
swscale: fix 12 and 14 bit YUV planar output with scaling.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopcmdec: check codec_id
Michael Niedermayer [Sat, 1 Dec 2012 01:36:01 +0000 (02:36 +0100)]
pcmdec: check codec_id

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocheck std tag size before reading.
Michael Niedermayer [Fri, 30 Nov 2012 23:29:39 +0000 (00:29 +0100)]
check std tag size before reading.

Fixes out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoqdm2: check array index before use, fix out of array accesses
Michael Niedermayer [Fri, 30 Nov 2012 22:59:40 +0000 (23:59 +0100)]
qdm2: check array index before use, fix out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoaacps: check iid/icc_par more completely.
Michael Niedermayer [Fri, 30 Nov 2012 18:24:56 +0000 (19:24 +0100)]
aacps: check iid/icc_par more completely.

Fixes global out of array read.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodxa: check reference frame availability before use.
Michael Niedermayer [Fri, 30 Nov 2012 19:58:26 +0000 (20:58 +0100)]
dxa: check reference frame availability before use.

Fix NULL pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoupdate Changelog
Paul B Mahol [Fri, 30 Nov 2012 16:51:44 +0000 (16:51 +0000)]
update Changelog

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agogifdec: remove width and height from demuxer context
Paul B Mahol [Fri, 30 Nov 2012 16:09:02 +0000 (16:09 +0000)]
gifdec: remove width and height from demuxer context

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agosmacker: more complete vlc length check, fixes out of array read
Michael Niedermayer [Fri, 30 Nov 2012 15:00:07 +0000 (16:00 +0100)]
smacker: more complete vlc length check, fixes out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosmacker: check smacker_decode_tree() return value
Michael Niedermayer [Fri, 30 Nov 2012 14:58:19 +0000 (15:58 +0100)]
smacker: check smacker_decode_tree() return value

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoundo file modifiers that suck in
Paul B Mahol [Fri, 30 Nov 2012 15:00:35 +0000 (15:00 +0000)]
undo file modifiers that suck in

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoAdd exception for "gif" in image2 probe() method.
Vitaliy E Sugrobov [Fri, 30 Nov 2012 08:58:57 +0000 (12:58 +0400)]
Add exception for "gif" in image2 probe() method.

Without this exception files with ".gif" extension by default
recognized as input suitable for image2 demuxer rather than gif.
In order to pass image through gif demuxer it was necessary
to use -f gif option.
This change affected 'make fate' test results because previously
image2 demuxer and gif decoder took only first frame of multiframe
test data, which is no longer true with gif demuxer.

Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
6 years agoGif demuxer
Vitaliy E Sugrobov [Fri, 30 Nov 2012 08:58:56 +0000 (12:58 +0400)]
Gif demuxer

Gif demuxer is capable of extracting multiple frames from gif file.
In conjunction with gif decoder it implements support for reading
animated gifs.
Demuxer has two options available to user: default_delay and min_delay.
These options are for protection from too rapid gif animations. In practice
it is standard approach to slow down rendering of this kind of gifs. If you try to
play gif with delay between frames of one hundredth of second (100fps) using
one of major web browsers, you get significantly slower playback,
around 10 fps. This is because browser detects that delay value is less than some
threshold (usually 2 hundredths of second) and reset it to default value (usually 10
hundredths of second, which corresponds to 10fps). Manipulating these options user
can achieve the same effect during conversion to some video format. Otherwise user
can set them to not protect from rapid animations at all.
The other case when these options necessary is for gif images encoded according to
gif87a standard since prior to gif89a there was no delay information included in file.
Bump lavf minor version.

Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
6 years agoMove some definitions to header file.
Vitaliy E Sugrobov [Fri, 30 Nov 2012 08:58:55 +0000 (12:58 +0400)]
Move some definitions to header file.

Share them with upcoming demuxer module.

Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
6 years agoAdditional checks to prevent overread.
Vitaliy E Sugrobov [Fri, 30 Nov 2012 08:58:54 +0000 (12:58 +0400)]
Additional checks to prevent overread.

Check for availability of some required amount of bytes in buffer before
reading further.

Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
6 years agoPrepare gif decoder for use in conjunction with gif demuxer.
Vitaliy E Sugrobov [Fri, 30 Nov 2012 08:58:53 +0000 (12:58 +0400)]
Prepare gif decoder for use in conjunction with gif demuxer.

Add capability of reading multiple frames instead of only first.
Implement support for different gif frame 'disposal methods'.
Add option that allows to change background color resulting from
conversion of gif with transparency to any other format which
not support it.
Also bump lavc minor version.

Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
6 years agoAdd meaningful error codes and constants.
Vitaliy E Sugrobov [Fri, 30 Nov 2012 08:58:52 +0000 (12:58 +0400)]
Add meaningful error codes and constants.

Replace literals with named constants in several pieces of code
like 'return -1' and 'case 0xab'.
Change the way decoder handles absence of image data in a file:
notify gif_decode_frame() caller with got_picture set to zero
instead of returning -1.

Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 30 Nov 2012 13:55:04 +0000 (14:55 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avutil: Include io.h with a separate condition from MapViewOfFile
  cmdutils: Use a configure check for enabling CommandLineToArgvW

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '9d46eaec7a90bd8f5cd9e45398c6d17804182320'
Michael Niedermayer [Fri, 30 Nov 2012 13:49:13 +0000 (14:49 +0100)]
Merge commit '9d46eaec7a90bd8f5cd9e45398c6d17804182320'

* commit '9d46eaec7a90bd8f5cd9e45398c6d17804182320':
  build: The FLAC encoder also depends on the flacdsp code
  img2: K&R formatting cosmetics
  h264: check context state before decoding slice data partitions
  flashsv: make sure data for zlib priming is available

Conflicts:
libavcodec/Makefile
libavformat/img2.c
libavformat/img2dec.c
libavformat/img2enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: add lavfi avr dep to .pc when required.
Clément Bœsch [Fri, 30 Nov 2012 13:19:14 +0000 (14:19 +0100)]
configure: add lavfi avr dep to .pc when required.

6 years agoadpcm/thp: cosmetics: reindent
Paul B Mahol [Fri, 30 Nov 2012 10:48:37 +0000 (10:48 +0000)]
adpcm/thp: cosmetics: reindent

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoiff: fix some incorrect interpretations of invalid files
Paul B Mahol [Fri, 30 Nov 2012 10:44:00 +0000 (10:44 +0000)]
iff: fix some incorrect interpretations of invalid files

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoiff: MAUD support
Paul B Mahol [Thu, 29 Nov 2012 10:45:28 +0000 (10:45 +0000)]
iff: MAUD support

Based on patch by Piotr Bandurski
Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoCorrectly skip strf tag for subtitles when decoding avi.
Carl Eugen Hoyos [Fri, 30 Nov 2012 09:18:37 +0000 (10:18 +0100)]
Correctly skip strf tag for subtitles when decoding avi.

Fixes ticket #1797.

6 years agolavc: fix duplicate stats_out line.
Michael Niedermayer [Fri, 30 Nov 2012 04:31:41 +0000 (05:31 +0100)]
lavc: fix duplicate stats_out line.

Found-by: Thierry Foucu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomjpegdec: print error message when quant_index is invalid
Michael Niedermayer [Fri, 30 Nov 2012 03:00:05 +0000 (04:00 +0100)]
mjpegdec: print error message when quant_index is invalid

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomjpegdec: check h/v_count, fix context becoming inconsistent and causing out of array...
Michael Niedermayer [Fri, 30 Nov 2012 02:58:38 +0000 (03:58 +0100)]
mjpegdec: check h/v_count, fix context becoming inconsistent and causing out of array accesses.

This also fixes a long standing comment in the code.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavu/opt: change the way default pixel and sample format value is set
Stefano Sabatini [Sun, 25 Nov 2012 14:45:58 +0000 (15:45 +0100)]
lavu/opt: change the way default pixel and sample format value is set

Use the i64 field rather than the string value. Using a string to set a
default sample/pixel format is weird, also the new interface is more
consistent with the rest of the API.

This is technically an API break, but hopefully there are no applications
using this feature outside of FFmpeg. In order to save backward
compatibility with mixed libraries in case libavutil is updated but not
the other libraries, some ifdeffery hacks are added.

Note that the version check is only performed when class->version != 0,
since if it is not defined then we assume that no version was defined and
the class is not affected by the change.

We will luckily get rid of the hack at the next major bump.

6 years agovble: check packet size.
Michael Niedermayer [Thu, 29 Nov 2012 22:10:03 +0000 (23:10 +0100)]
vble: check packet size.

Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoid3v2: check index against buffer size. Fix out of array access
Michael Niedermayer [Thu, 29 Nov 2012 21:57:39 +0000 (22:57 +0100)]
id3v2: check index against buffer size. Fix out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoiff: mention all decoders
Piotr Bandurski [Thu, 29 Nov 2012 19:16:10 +0000 (19:16 +0000)]
iff: mention all decoders

6 years agoBRSTM demuxer
Paul B Mahol [Fri, 23 Nov 2012 11:20:11 +0000 (11:20 +0000)]
BRSTM demuxer

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavutil: Include io.h with a separate condition from MapViewOfFile
Martin Storsjö [Thu, 29 Nov 2012 15:02:42 +0000 (17:02 +0200)]
avutil: Include io.h with a separate condition from MapViewOfFile

The existence of MapViewOfFile isn't linked to the existence of
io.h.

Not all versions of windows have MapViewOfFile (in particular,
Windows Phone 8 and the "metro" windows 8 API subset don't),
while they still have io.h (and need it for open/read/close).

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agocmdutils: Use a configure check for enabling CommandLineToArgvW
Martin Storsjö [Thu, 29 Nov 2012 15:02:24 +0000 (17:02 +0200)]
cmdutils: Use a configure check for enabling CommandLineToArgvW

This simplifies the condition to avoid hardcoding the systems
where the function exists. This also simplifies support for
newer Windows API subsets where this function doesn't exist,
such as Windows Phone 8 and the "metro" API subset of Windows 8.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agobuild: The FLAC encoder also depends on the flacdsp code
Diego Biurrun [Thu, 29 Nov 2012 09:34:05 +0000 (10:34 +0100)]
build: The FLAC encoder also depends on the flacdsp code

Fixes linking with only the FLAC encoder enabled.

6 years agoimg2: K&R formatting cosmetics
Diego Biurrun [Thu, 29 Nov 2012 03:56:40 +0000 (04:56 +0100)]
img2: K&R formatting cosmetics

Also introduce local img_ namespace to simplify debugging.

6 years agohuffyuvdec: check width more completely, avoid out of array accesses
Michael Niedermayer [Thu, 29 Nov 2012 14:56:05 +0000 (15:56 +0100)]
huffyuvdec: check width more completely, avoid out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotiffdec: better checks for bitstream offsets, fixes out of array reads
Michael Niedermayer [Thu, 29 Nov 2012 14:34:29 +0000 (15:34 +0100)]
tiffdec: better checks for bitstream offsets, fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoroqvideodec: check dimensions validity
Michael Niedermayer [Thu, 29 Nov 2012 14:18:17 +0000 (15:18 +0100)]
roqvideodec: check dimensions validity

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: check context state before decoding slice data partitions
Janne Grunau [Wed, 28 Nov 2012 21:17:14 +0000 (22:17 +0100)]
h264: check context state before decoding slice data partitions

Fixes mov_h264_aac__Demo_FlagOfOurFathers.mov.SIGSEGV.4e9.656.

Found-by: Mateusz "j00ru" Jurczyk
CC: libav-stable@libav.org
6 years agofate: add tak dependencies
Paul B Mahol [Thu, 29 Nov 2012 13:06:53 +0000 (13:06 +0000)]
fate: add tak dependencies

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agofate: add ADPCM 4XM test
Paul B Mahol [Wed, 28 Nov 2012 14:44:20 +0000 (14:44 +0000)]
fate: add ADPCM 4XM test

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 29 Nov 2012 13:22:58 +0000 (14:22 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avplay: Do not use removed av_get_int()
  avconv: fix variable shadowing in configure_input_audio_filter()

Conflicts:
ffmpeg_filter.c
ffplay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e4d349b4014ee2a03f521027e0bd1ace4a9e60bd'
Michael Niedermayer [Thu, 29 Nov 2012 13:16:46 +0000 (14:16 +0100)]
Merge commit 'e4d349b4014ee2a03f521027e0bd1ace4a9e60bd'

* commit 'e4d349b4014ee2a03f521027e0bd1ace4a9e60bd':
  fate: h264: Add dependencies
  fate: ea: Add dependencies
  fate: Do not unconditionally run libavutil tests
  rtpenc_chain: Remove unused variable
  nuv: check for malloc failure when allocating extradata
  nuv: use the stream indices generated by avformat_new_stream()

Conflicts:
tests/fate/ea.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoflashsv: make sure data for zlib priming is available
Janne Grunau [Wed, 28 Nov 2012 16:31:35 +0000 (17:31 +0100)]
flashsv: make sure data for zlib priming is available

Fixes a segfault in the fuzzed sample resolutionchange.flv_s314809.

CC: libav-stable@libav.org
6 years agoMerge commit 'c74f81786d434dfaf9b3dff06aa96bfd23d0127b'
Michael Niedermayer [Thu, 29 Nov 2012 13:07:51 +0000 (14:07 +0100)]
Merge commit 'c74f81786d434dfaf9b3dff06aa96bfd23d0127b'

* commit 'c74f81786d434dfaf9b3dff06aa96bfd23d0127b':
  nuv: cosmetics: pretty-printing

Conflicts:
libavformat/nuv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5c7bf2dddee5bdfa247ff0d57cb8a37d19077f66'
Michael Niedermayer [Thu, 29 Nov 2012 12:58:57 +0000 (13:58 +0100)]
Merge commit '5c7bf2dddee5bdfa247ff0d57cb8a37d19077f66'

* commit '5c7bf2dddee5bdfa247ff0d57cb8a37d19077f66':
  lavf: move nuv fourcc audio tags from riff to nuv
  lavf: add a common function for selecting a pcm codec from parameters

Conflicts:
libavformat/internal.h
libavformat/mov.c
libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'bfe5454cd238b16e7977085f880205229103eccb'
Michael Niedermayer [Thu, 29 Nov 2012 12:45:57 +0000 (13:45 +0100)]
Merge commit 'bfe5454cd238b16e7977085f880205229103eccb'

* commit 'bfe5454cd238b16e7977085f880205229103eccb':
  lavf: move ff_codec_get_tag() and ff_codec_get_id() definitions to internal.h
  lavf: move "MP3 " fourcc from riff to nut
  fate: vpx: Add dependencies
  fate: Fix wavpack-matroskamode test dependencies
  x86: dsputilenc: port to cpuflags

Conflicts:
libavformat/internal.h
libavformat/nut.c
tests/fate/vpx.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1f3f896564501c23b44fcf605567c78ce066b539'
Michael Niedermayer [Thu, 29 Nov 2012 12:29:26 +0000 (13:29 +0100)]
Merge commit '1f3f896564501c23b44fcf605567c78ce066b539'

* commit '1f3f896564501c23b44fcf605567c78ce066b539':
  fate: Add dependencies for Vorbis, ProRes, QTRLE, utvideo tests
  fate: real: Add dependencies
  fate: lossless-audio: Add dependencies
  x86: h264dsp: Fix linking with yasm and optimizations disabled

Conflicts:
libavcodec/x86/h264dsp_init.c
tests/fate/lossless-audio.mak
tests/fate/real.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/concat: prefer av_asprintf() over stack allocated buffer.
Clément Bœsch [Thu, 29 Nov 2012 11:25:02 +0000 (12:25 +0100)]
lavfi/concat: prefer av_asprintf() over stack allocated buffer.

6 years agolavfi/concat: switch to filter_frame.
Clément Bœsch [Thu, 29 Nov 2012 11:23:26 +0000 (12:23 +0100)]
lavfi/concat: switch to filter_frame.

6 years agolavfi/smartblur: switch to filter_frame.
Clément Bœsch [Thu, 29 Nov 2012 11:49:03 +0000 (12:49 +0100)]
lavfi/smartblur: switch to filter_frame.

6 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().

6 years agoavplay: Do not use removed av_get_int()
Anton Khirnov [Wed, 28 Nov 2012 20:23:57 +0000 (21:23 +0100)]
avplay: Do not use removed av_get_int()

Fixes build with lavfi disabled.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 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.

6 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.

6 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

6 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>
6 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.

6 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>
6 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>
6 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>
6 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.

6 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>
6 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.

6 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.

6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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.

6 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.

6 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.

6 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>
6 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>
6 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.

6 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.

6 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.

6 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.

6 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>
6 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>
6 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>
6 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>
6 years agoavconv: fix variable shadowing in configure_input_audio_filter()
Justin Ruggles [Tue, 2 Oct 2012 18:12:27 +0000 (14:12 -0400)]
avconv: fix variable shadowing in configure_input_audio_filter()

6 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>
6 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>
6 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>
6 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

6 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>

6 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>
6 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.

6 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>
6 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>
6 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>
6 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>