]>
git.sesse.net Git - ffmpeg/log
Stefano Sabatini [Sun, 2 Dec 2012 00:11:52 +0000 (01:11 +0100)]
lavfi/alphamerge: switch to ff_filter_frame() API
Stefano Sabatini [Sat, 1 Dec 2012 23:58:59 +0000 (00:58 +0100)]
lavfi/blackdetect: switch to new ff_filter_frame() API
Nicolas George [Sat, 1 Dec 2012 15:58:51 +0000 (16:58 +0100)]
lavu/parseutils: accept %J for hours >= 24.
Allow to parse durations >= 24:00:00.
Michael Niedermayer [Sun, 2 Dec 2012 03:21:42 +0000 (04:21 +0100)]
mpc8: check seektable size before attempting to use it.
Fixes null pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 2 Dec 2012 03:00:50 +0000 (04:00 +0100)]
dcadec: fix reading from prior to an array
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sun, 2 Dec 2012 01:53:22 +0000 (02:53 +0100)]
lavfi/hqdn3d: avoid use of uninitialized variable.
Clément Bœsch [Sun, 2 Dec 2012 01:25:09 +0000 (02:25 +0100)]
lavfi/gradfun: avoid use of uninitialized variable.
Michael Niedermayer [Sat, 1 Dec 2012 22:20:48 +0000 (23:20 +0100)]
xxan: more complete ybuf checks, fix out of array accesses.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sat, 1 Dec 2012 23:43:39 +0000 (00:43 +0100)]
Add FourCC V264 for H264 in CCTV recordings.
Clément Bœsch [Sat, 1 Dec 2012 00:24:21 +0000 (01:24 +0100)]
lavfi/vsrc: switch to ff_filter_frame.
Clément Bœsch [Fri, 23 Nov 2012 21:47:51 +0000 (22:47 +0100)]
lavf/assdec: return appropriate error code instead of -1.
Clément Bœsch [Fri, 23 Nov 2012 21:47:09 +0000 (22:47 +0100)]
lavf/assdec: add ass_ prefix to callbacks.
Clément Bœsch [Fri, 23 Nov 2012 21:45:05 +0000 (22:45 +0100)]
lavf/assdec: rewrite using the demux subtitles API.
Clément Bœsch [Fri, 23 Nov 2012 20:43:54 +0000 (21:43 +0100)]
lavf: use ff_subtitles_queue_seek() for text subtitles demuxers.
Clément Bœsch [Fri, 30 Nov 2012 06:00:59 +0000 (07:00 +0100)]
lavf/subtitles: seek a little more backward when necessary.
If some previous subtitles are overlapping with the current time
we make sure they are raised so the renderer can display them too.
Clément Bœsch [Fri, 23 Nov 2012 20:40:46 +0000 (21:40 +0100)]
lavf/subtitles: add ff_subtitles_queue_seek().
This function is almost identical to lavf/assdec:read_seek2(). It
performs a generic seek for text subtitles demuxers for the new seeking
API.
The only difference with assdec:read_seek2 is the ts_diff being
unsigned to avoid overflows.
The seek callback in the ASS demuxer will be removed when it is
redesigned to use FFDemuxSubtitlesQueue.
Clément Bœsch [Fri, 23 Nov 2012 20:11:49 +0000 (21:11 +0100)]
ffmpeg: use avformat_seek_file() instead of av_seek_frame().
avformat_seek_file() is the new API. It will make sure the read_seek2()
callback is called when the demuxer has it.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
Michael Niedermayer [Sat, 1 Dec 2012 21:09:14 +0000 (22:09 +0100)]
vmnc: Check for integer overflow
Fixes null pointer dereference and potential out of array accesses.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 1 Dec 2012 20:42:02 +0000 (21:42 +0100)]
dcadec: check lfe field
Fix out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 30 Nov 2012 16:49:24 +0000 (16:49 +0000)]
PVF demuxer
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Carl Eugen Hoyos [Sat, 1 Dec 2012 20:16:11 +0000 (21:16 +0100)]
Support Sorenson Spark in f4v files streamed by Flash Media Server.
Michael Niedermayer [Sat, 1 Dec 2012 19:15:02 +0000 (20:15 +0100)]
mxfdec: check index_tables before dereferencing in close.
Fixes null pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 1 Dec 2012 18:16:19 +0000 (19:16 +0100)]
svq1dec: update w/h only if the header is successfully parsed.
Prevents inconsistency and out of array accesses.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sat, 1 Dec 2012 00:07:24 +0000 (01:07 +0100)]
lavu/opt: allow to set sample and pixel format with av_opt_set_int()
This change requires the user to specify min and max value, and makes
possible to prevent the user to set AV_{SAMPLE,PIX}_FMT_NONE if
forbidden.
Add required ifdeffery in case of mixed libraries, when libavutil is
updated but not the other libraries.
This is a followup of
08d0969c1402ccec4dce44bd430128fb59d7b790 .
Michael Niedermayer [Sat, 1 Dec 2012 16:02:04 +0000 (17:02 +0100)]
fate/mp3: increase fuzz for NEON, due to different rounding from lrintf()
This should fix fate failures of the hecommon test
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sat, 1 Dec 2012 11:47:51 +0000 (12:47 +0100)]
lavfi/geq: add T variable and example
Michael Niedermayer [Sat, 1 Dec 2012 12:10:48 +0000 (13:10 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Use headers in the check for _beginthreadex for w32threads
avutil: Use a configure check to enable windows console functions
avutil: Include io.h with a separate condition from windows console functions
Conflicts:
libavutil/log.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sat, 1 Dec 2012 12:05:25 +0000 (13:05 +0100)]
doc/ffmpeg-filters: add short description
Michael Niedermayer [Sat, 1 Dec 2012 11:56:12 +0000 (12:56 +0100)]
tests/ref/seek/lavf_gif: update for
9d5cfce85540 : gifdec: rudimentary seeking
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sat, 1 Dec 2012 11:07:50 +0000 (11:07 +0000)]
gifdec: rudimentary seeking
With this ffplay -loop X successfully seeks to start.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sat, 1 Dec 2012 10:53:22 +0000 (10:53 +0000)]
gifdec: use av_fast_malloc()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sat, 1 Dec 2012 10:13:18 +0000 (10:13 +0000)]
shorten: return more meaningful error codes
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sat, 1 Dec 2012 10:00:16 +0000 (10:00 +0000)]
ws-snd1: return meaningful error code
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sat, 1 Dec 2012 09:51:52 +0000 (09:51 +0000)]
wnv1: return more meaningful error codes
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sat, 1 Dec 2012 09:33:20 +0000 (09:33 +0000)]
xldec: K&R formatting cosmetics
Signed-off-by: Paul B Mahol <onemda@gmail.com>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Martin Storsjö [Fri, 30 Nov 2012 14:57:02 +0000 (16:57 +0200)]
configure: Use headers in the check for _beginthreadex for w32threads
When targeting the metro API subset, this function still exists in
the link libraries, but is excluded from the headers. This makes
sure w32threads is automatically disabled when targeting this API
subset (since not all the necessary functions for it are available).
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 30 Nov 2012 14:56:57 +0000 (16:56 +0200)]
avutil: Use a configure check to enable windows console functions
Not all versions or API subsets of windows have these functions.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 30 Nov 2012 14:56:54 +0000 (16:56 +0200)]
avutil: Include io.h with a separate condition from windows console functions
Not all versions of windows have the console color functions,
while io.h might be needed for isatty (which can be found in
unistd.h or io.h).
Signed-off-by: Martin Storsjö <martin@martin.st>
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>
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>
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>
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>
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>
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>
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>
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>
Clément Bœsch [Fri, 30 Nov 2012 13:19:14 +0000 (14:19 +0100)]
configure: add lavfi avr dep to .pc when required.
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>
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>
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>
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.
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>
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>
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>
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.
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>
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>
Piotr Bandurski [Thu, 29 Nov 2012 19:16:10 +0000 (19:16 +0000)]
iff: mention all decoders
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>
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>
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>
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.
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.
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>
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>
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>
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
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>
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>
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>
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>
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
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>
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>
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>
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>
Clément Bœsch [Thu, 29 Nov 2012 11:25:02 +0000 (12:25 +0100)]
lavfi/concat: prefer av_asprintf() over stack allocated buffer.
Clément Bœsch [Thu, 29 Nov 2012 11:23:26 +0000 (12:23 +0100)]
lavfi/concat: 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.
Clément Bœsch [Thu, 29 Nov 2012 02:56:07 +0000 (03:56 +0100)]
lavfi/show{spectrum,waves}: use ff_filter_frame().
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>
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.
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.
Stefano Sabatini [Tue, 27 Nov 2012 23:22:21 +0000 (00:22 +0100)]
doc/ffmpeg-codecs: add short description
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>
Clément Bœsch [Thu, 29 Nov 2012 02:48:14 +0000 (03:48 +0100)]
lavfi/ebur128: use ff_filter_frame() everywhere.