]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Fri, 21 Oct 2011 20:26:13 +0000 (22:26 +0200)]
utils: flush on successfull av_seek_frame_binary()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 21 Oct 2011 19:11:28 +0000 (21:11 +0200)]
mpegts: cache information to speed up seeking.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 21 Oct 2011 18:45:00 +0000 (20:45 +0200)]
seek: Fix av_gen_search() so that seeks outside max/min do not successfully seek to random
points but rather seek to the min/max.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 21 Oct 2011 15:37:08 +0000 (17:37 +0200)]
mpegts: assert position in dts reading code.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 21 Oct 2011 14:11:00 +0000 (16:11 +0200)]
mpegts: add and use mpegts_get_dts()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 21 Oct 2011 14:10:16 +0000 (16:10 +0200)]
mpegts: fix type of argument of mpegts_resync()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul Flinders [Thu, 20 Oct 2011 14:10:16 +0000 (16:10 +0200)]
deshake: add documentation in filters.texi
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Michael Niedermayer [Fri, 21 Oct 2011 00:11:08 +0000 (02:11 +0200)]
fix shared lib build
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 20 Oct 2011 23:27:28 +0000 (01:27 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master: (47 commits)
lavc: hide private symbols.
lavc: deprecate img_get_alpha_info().
lavc: use avpriv_ prefix for ff_toupper4.
lavc: use avpriv_ prefix for ff_copy_bits and align_put_bits.
lavc: use avpriv_ prefix for ff_ac3_parse_header.
lavc: use avpriv_ prefix for ff_frame_rate_tab.
lavc: rename ff_find_start_code to avpriv_mpv_find_start_code
lavc: use avpriv_ prefix for ff_split_xiph_headers.
lavc: use avpriv_ prefix for ff_dirac_parse_sequence_header.
lavc: use avpriv_ prefix for some dv symbols used in lavf.
lavc: use avpriv_ prefix for some flac symbols used in lavf.
lavc: use avpriv_ prefix for some mpeg4audio symbols used in lavf.
lavc: use avpriv_ prefix for some mpegaudio symbols used in lavf.
lavc: use avpriv_ prefix for ff_aac_parse_header().
lavf: hide private symbols.
lavf: use avpriv_ prefix for some dv functions.
lavf: use avpriv_ prefix for ff_new_chapter().
avcodec: add CODEC_CAP_DELAY note to avcodec_decode_audio3() documentation
avcodec: clarify the CODEC_CAP_DELAY note in avcodec_decode_video2()
avcodec: clarify documentation of CODEC_CAP_DELAY
...
Conflicts:
configure
doc/general.texi
libavcodec/Makefile
libavcodec/aacdec.c
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/dv.c
libavcodec/dvdata.c
libavcodec/dvdata.h
libavcodec/libspeexenc.c
libavcodec/mpegvideo.c
libavcodec/version.h
libavformat/avidec.c
libavformat/dv.c
libavformat/dv.h
libavformat/flvenc.c
libavformat/mov.c
libavformat/mp3enc.c
libavformat/oggparsespeex.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 20 Oct 2011 22:36:00 +0000 (00:36 +0200)]
swr: Fix swresample.c:293:5: warning: passing argument 2 of ‘fill_audiodata’ from incompatible pointer type
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 20 Oct 2011 22:34:37 +0000 (00:34 +0200)]
swr: remove unused variable.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 20 Oct 2011 22:33:04 +0000 (00:33 +0200)]
swr: Fix assignment discards qualifiers from pointer target type warning.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 20 Oct 2011 22:31:20 +0000 (00:31 +0200)]
resample2: Fix passing argument from incompatible pointer type warnings.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 20 Oct 2011 22:30:41 +0000 (00:30 +0200)]
swr: Mark src as const in swr_resample()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 20 Oct 2011 22:28:03 +0000 (00:28 +0200)]
rematrix: Fix several passing argument from incompatible pointer type warnings.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lou Logan [Thu, 20 Oct 2011 19:08:50 +0000 (11:08 -0800)]
presets: spelling error in libvpx 1080p50_60
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 20 Oct 2011 19:57:52 +0000 (21:57 +0200)]
aacdec:only overwrite configuration if theres a actual change.
Fixes Ticket574
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Mon, 17 Oct 2011 08:13:16 +0000 (10:13 +0200)]
lavc: hide private symbols.
Overhead as reported by rbelf-size goes from 90860 to 20204.
Anton Khirnov [Mon, 17 Oct 2011 18:08:02 +0000 (20:08 +0200)]
lavc: deprecate img_get_alpha_info().
It's never been touched or used in any way since it was added in 2003
and only works for PIX_FMT_PAL8, which makes me conclude that nobody's
ever used it.
Anton Khirnov [Mon, 17 Oct 2011 08:12:51 +0000 (10:12 +0200)]
lavc: use avpriv_ prefix for ff_toupper4.
It's used in lavf.
Anton Khirnov [Mon, 17 Oct 2011 08:10:42 +0000 (10:10 +0200)]
lavc: use avpriv_ prefix for ff_copy_bits and align_put_bits.
They are used in lavf.
Anton Khirnov [Mon, 17 Oct 2011 08:04:12 +0000 (10:04 +0200)]
lavc: use avpriv_ prefix for ff_ac3_parse_header.
It's used in lavf.
Anton Khirnov [Mon, 17 Oct 2011 07:59:31 +0000 (09:59 +0200)]
lavc: use avpriv_ prefix for ff_frame_rate_tab.
It's used in lavf.
Anton Khirnov [Mon, 17 Oct 2011 07:51:55 +0000 (09:51 +0200)]
lavc: rename ff_find_start_code to avpriv_mpv_find_start_code
It's used in lavf.
Anton Khirnov [Mon, 17 Oct 2011 07:45:27 +0000 (09:45 +0200)]
lavc: use avpriv_ prefix for ff_split_xiph_headers.
It's used in lavf.
Anton Khirnov [Mon, 17 Oct 2011 07:45:27 +0000 (09:45 +0200)]
lavc: use avpriv_ prefix for ff_dirac_parse_sequence_header.
It's used in lavf.
Anton Khirnov [Mon, 17 Oct 2011 07:28:53 +0000 (09:28 +0200)]
lavc: use avpriv_ prefix for some dv symbols used in lavf.
Specifically, ff_dv_frame_profile and ff_dv_codec_profile.
Anton Khirnov [Mon, 17 Oct 2011 07:28:53 +0000 (09:28 +0200)]
lavc: use avpriv_ prefix for some flac symbols used in lavf.
Specifically, ff_flac_parse_streaminfo, ff_flac_is_extradata_valid and
ff_flac_parse_block_header
Anton Khirnov [Mon, 17 Oct 2011 07:28:53 +0000 (09:28 +0200)]
lavc: use avpriv_ prefix for some mpeg4audio symbols used in lavf.
Specifically, ff_mpeg4audio_sample_rates, ff_mpeg4audio_get_config and
ff_copy_pce_data
Anton Khirnov [Mon, 17 Oct 2011 07:28:53 +0000 (09:28 +0200)]
lavc: use avpriv_ prefix for some mpegaudio symbols used in lavf.
Specifically, ff_mpa_freq_tab, ff_mpa_bitrate_tab, ff_mpa_decode_header,
ff_mpegaudio_decode_header.
Anton Khirnov [Mon, 17 Oct 2011 07:22:04 +0000 (09:22 +0200)]
lavc: use avpriv_ prefix for ff_aac_parse_header().
It's used in lavf.
Anton Khirnov [Mon, 17 Oct 2011 07:14:04 +0000 (09:14 +0200)]
lavf: hide private symbols.
Overhead as reported by rbelf-size goes from 40147 to 20877.
Anton Khirnov [Mon, 17 Oct 2011 06:58:50 +0000 (08:58 +0200)]
lavf: use avpriv_ prefix for some dv functions.
They are used in libavdevice.
Anton Khirnov [Mon, 17 Oct 2011 06:58:50 +0000 (08:58 +0200)]
lavf: use avpriv_ prefix for ff_new_chapter().
It's used in libavdevice.
Justin Ruggles [Sun, 25 Sep 2011 21:09:57 +0000 (17:09 -0400)]
avcodec: add CODEC_CAP_DELAY note to avcodec_decode_audio3() documentation
Justin Ruggles [Sun, 25 Sep 2011 21:09:03 +0000 (17:09 -0400)]
avcodec: clarify the CODEC_CAP_DELAY note in avcodec_decode_video2()
Justin Ruggles [Sun, 25 Sep 2011 21:05:34 +0000 (17:05 -0400)]
avcodec: clarify documentation of CODEC_CAP_DELAY
Justin Ruggles [Sat, 17 Sep 2011 01:34:42 +0000 (21:34 -0400)]
shorten: fix end-of-stream decoding.
enable CODEC_CAP_DELAY to flush any remaining frames in the buffer.
Stop decoding when the FN_QUIT command is found so that a trailing seek table
isn't decoded as a normal frame.
decode all channels in the same call to avcodec_decode_audio3() so that
decoding will not stop after the first channel of the last frame.
Updated FATE reference. More valid audio is now decoded.
Justin Ruggles [Sat, 17 Sep 2011 00:54:11 +0000 (20:54 -0400)]
shorten: do not use block size to determine whether to read the header.
Justin Ruggles [Fri, 16 Sep 2011 22:01:28 +0000 (18:01 -0400)]
shorten: check output buffer size before decoding
Justin Ruggles [Fri, 16 Sep 2011 21:51:40 +0000 (17:51 -0400)]
shorten: use av_clip_int16() for output sample clipping
Justin Ruggles [Fri, 16 Sep 2011 21:40:44 +0000 (17:40 -0400)]
shorten: use bytestream functions to decode the embedded WAVE header
Justin Ruggles [Fri, 16 Sep 2011 21:31:12 +0000 (17:31 -0400)]
shorten: add some comments
Justin Ruggles [Fri, 16 Sep 2011 19:55:27 +0000 (15:55 -0400)]
shorten: merge decoding of FN_DIFF* subblocks into decode_subframe_lpc()
Justin Ruggles [Fri, 16 Sep 2011 19:39:51 +0000 (15:39 -0400)]
cosmetics: remove some needless commented-out stuff
Justin Ruggles [Fri, 16 Sep 2011 19:31:31 +0000 (15:31 -0400)]
shorten: validate block size
Justin Ruggles [Fri, 16 Sep 2011 15:24:14 +0000 (11:24 -0400)]
shorten: move declaration of 'ret' to top of shorten_decode_frame()
Justin Ruggles [Fri, 16 Sep 2011 15:22:37 +0000 (11:22 -0400)]
shorten: pass on error value from allocate_buffers() instead of returning -1
Justin Ruggles [Thu, 15 Sep 2011 22:08:52 +0000 (18:08 -0400)]
shorten: check for realloc failure
Justin Ruggles [Wed, 14 Sep 2011 23:16:14 +0000 (19:16 -0400)]
shorten: move decoding of prediction order and applying of global offset to
decode_subframe_lpc().
Justin Ruggles [Wed, 14 Sep 2011 22:54:42 +0000 (18:54 -0400)]
shorten: only calculate output size when returning decoded samples, otherwise
just set data_size to zero.
Justin Ruggles [Thu, 15 Sep 2011 04:03:35 +0000 (00:03 -0400)]
cosmetics: reindent
Justin Ruggles [Wed, 14 Sep 2011 22:46:37 +0000 (18:46 -0400)]
shorten: separate processing of audio commands from non-audio commands
Justin Ruggles [Wed, 14 Sep 2011 19:20:22 +0000 (15:20 -0400)]
shorten: skip some fields in the WAV header embedded in the shorten header.
fixes incorrect bitrate reporting and potential misreporting of the number of
channels.
Justin Ruggles [Wed, 14 Sep 2011 19:02:35 +0000 (15:02 -0400)]
shorten: split reading of file header into a separate functions
Justin Ruggles [Wed, 19 Oct 2011 18:00:06 +0000 (14:00 -0400)]
avformat: do not require frame_size for Speex.
Having it there forces decoding of a frame in order to get frame_size, but it
is not really needed for proper demuxing or decoding.
Justin Ruggles [Wed, 19 Oct 2011 17:28:12 +0000 (13:28 -0400)]
ogg/speex: set correct timestamp and duration for the first packet.
The first timestamp should be negative due to delay.
Also, do not set AVCodecContext.frame_size unnecessarily.
Justin Ruggles [Wed, 19 Oct 2011 17:20:15 +0000 (13:20 -0400)]
flvenc: check packet duration in speex using timestamps
Using AVCodecContext.frame_size is not reliable.
Justin Ruggles [Tue, 18 Oct 2011 19:16:27 +0000 (12:16 -0700)]
libspeexenc: add libspeex encoder
Justin Ruggles [Wed, 19 Oct 2011 17:16:01 +0000 (13:16 -0400)]
flvenc: adjust for negative DTS for all codecs, not just H.264
Michael Niedermayer [Thu, 20 Oct 2011 14:22:50 +0000 (16:22 +0200)]
presets: favor vprofile over profile to avoid conflicts with audio profiles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Thu, 20 Oct 2011 13:43:16 +0000 (15:43 +0200)]
x86: Move some variable declarations below the appropriat #ifdef.
This avoids some unused variable warnings with YASM disabled.
Diego Biurrun [Thu, 20 Oct 2011 13:59:22 +0000 (15:59 +0200)]
x86: Fix linking of ProRes DSP ASM with YASM disabled.
Stefano Sabatini [Thu, 20 Oct 2011 13:56:56 +0000 (15:56 +0200)]
lavfi: add missing header mulitple-inclusion guard in transform.h
Stefano Sabatini [Thu, 20 Oct 2011 13:49:54 +0000 (15:49 +0200)]
lavfi/transform.h: apply misc doxy cosmetical changes
Michael Niedermayer [Thu, 20 Oct 2011 11:54:54 +0000 (13:54 +0200)]
aacdec: support chan config =1 stereo files
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 20 Oct 2011 00:23:36 +0000 (02:23 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
presets: rename presets directory
lavc: make avcodec_get_context_defaults3 "officially" public
lavf: replace av_new_stream->avformat_new_stream part II.
lavf,lavd: replace av_new_stream->avformat_new_stream part I.
lavf: add avformat_new_stream as a replacement for av_new_stream.
Use correct scaling table for bwd-pred MVs in second B-field
Ut Video decoder
Makefile: change presets extension to .avpreset
lavfi: add rgbtestsrc source, ported from MPlayer libmpcodecs
lavfi: add testsrc source
AVOptions: add documentation.
presets: update libx264 ffpresets
Conflicts:
Changelog
doc/APIchanges
doc/ffmpeg.texi
ffpresets/libx264-ipod320.ffpreset
ffpresets/libx264-ipod640.ffpreset
ffserver.c
libavcodec/avcodec.h
libavcodec/options.c
libavcodec/version.h
libavdevice/libdc1394.c
libavfilter/avfilter.h
libavfilter/vsrc_testsrc.c
libavformat/flvdec.c
libavformat/riff.c
libavformat/version.h
libavformat/wtv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul Flinders [Wed, 19 Oct 2011 22:39:34 +0000 (00:39 +0200)]
deshake: limit deshake to specific area to search for motion vectors.
Michael Niedermayer [Wed, 19 Oct 2011 22:29:21 +0000 (00:29 +0200)]
v210dec: remove debuging #include
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Wed, 19 Oct 2011 21:12:56 +0000 (23:12 +0200)]
avcodec.h: Move G.729/G.723 CODEC_IDs to the correct section.
This is done conditional to the libavcodec version to avoid ABI breaks.
Diego Biurrun [Wed, 19 Oct 2011 21:25:01 +0000 (23:25 +0200)]
Only test-compile w32pthreads.h if W32THREADS are available.
This fixes 'make checkheaders' on non-W32THREADS systems.
Laurent Aimar [Sat, 8 Oct 2011 21:40:41 +0000 (23:40 +0200)]
mpegts: do not return from ff_mpegts_parse_packet() after having seen the first PMT
It prevents leaving the AVPacket uninitialized.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Laurent Aimar [Sat, 8 Oct 2011 21:40:40 +0000 (23:40 +0200)]
mpegts: fix return value when enough ts packets have been parsed or when the first PMT has been seen.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Matthew Einhorn [Thu, 25 Aug 2011 00:14:03 +0000 (20:14 -0400)]
Fixes avpicture_layout to not write past buffer end.
avpicture_get_size() returns the size of buffer required for avpicture_layout.
For pseudo-paletted formats (gray8...) this size does not include the palette.
However, avpicture_layout doesn't know this and still writes the palette. Consequently,
avpicture_layout writes passed the length of the buffer. This fixes it
by fixing avpicture_layout so that it doesn't write the palette for these formats.
Signed-off-by: Matthew Einhorn <moiein2000@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Oct 2011 20:57:36 +0000 (22:57 +0200)]
mpegtsenc: fix handling of large audio packets
(sorry i have no sample, just a user report)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Wed, 19 Oct 2011 06:22:23 +0000 (08:22 +0200)]
presets: rename presets directory
Clément Bœsch [Wed, 19 Oct 2011 18:56:02 +0000 (20:56 +0200)]
mpeg12: remove '[' and ']' around last timecode field to match std representation.
Kieran Kunhya [Tue, 18 Oct 2011 18:50:49 +0000 (19:50 +0100)]
Add V210 SIMD
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Kieran Kunhya [Sun, 5 Jun 2011 14:19:16 +0000 (15:19 +0100)]
Move x264asm to libavutil.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Wed, 19 Oct 2011 16:41:02 +0000 (18:41 +0200)]
Do not call parse_keyframes_index with NULL stream.
Seems to fix trac issue #569.
Sample is unfortunately not available, but it might be caused by
an index existing for non-existing audio stream (?).
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Anton Khirnov [Sat, 8 Oct 2011 06:47:47 +0000 (08:47 +0200)]
lavc: make avcodec_get_context_defaults3 "officially" public
Deprecate avcodec_get_context_defaults/avcodec_get_context_defaults2
Anton Khirnov [Sat, 18 Jun 2011 09:43:24 +0000 (11:43 +0200)]
lavf: replace av_new_stream->avformat_new_stream part II.
Manual replacements are done in this commit.
In many cases, the id is some constant made up number (e.g. 0 for video
and 1 for audio), which is then not used in the demuxer for anything.
Those ids are removed.
Anton Khirnov [Sat, 18 Jun 2011 09:43:24 +0000 (11:43 +0200)]
lavf,lavd: replace av_new_stream->avformat_new_stream part I.
Trivial replacements with sed are done in this commit:
sed 's/av_new_stream(\([^)]*\), 0)/avformat_new_stream(\1, NULL)/'
Anton Khirnov [Sat, 18 Jun 2011 09:19:27 +0000 (11:19 +0200)]
lavf: add avformat_new_stream as a replacement for av_new_stream.
It takes a codec parameter, thus enabling codec-specific defaults.
Mashiat Sarker Shakkhar [Wed, 19 Oct 2011 13:51:20 +0000 (18:51 +0500)]
Use correct scaling table for bwd-pred MVs in second B-field
When scaling backward predicted MVs in second B-field, the scaling table is
opposite of that for P field pictures; i.e. first field P table will be used as
second field B table and second field P table will be used as first field B
table. This is not documented in the spec, but exists in the ref. decoder.
This fixes SA10139.
Signed-off-by: Martin Storsjö <martin@martin.st>
Carl Eugen Hoyos [Wed, 19 Oct 2011 09:20:48 +0000 (11:20 +0200)]
Fix AMR block length for no data mode when muxing mov.
Fixes ticket #550.
This had been analyzed and reported by Igor Levin, igor d levin comverse com
Kostya Shishkov [Sun, 16 Oct 2011 15:20:17 +0000 (17:20 +0200)]
Ut Video decoder
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Wed, 19 Oct 2011 05:50:12 +0000 (07:50 +0200)]
Makefile: change presets extension to .avpreset
Fixes make install.
Stefano Sabatini [Mon, 11 Jul 2011 14:27:09 +0000 (16:27 +0200)]
lavfi: add rgbtestsrc source, ported from MPlayer libmpcodecs
The licence was changed from GPL to LGPL with explicit approval from
the original author.
See thread:
Subject: [FFmpeg-devel] [PATCH] lavfi: add rgbtestsrc source,
ported from MPlayer libmpcodecs
Date: Mon, 11 Jul 2011 16:32:41 +0200
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Stefano Sabatini [Sat, 18 Jun 2011 01:11:16 +0000 (03:11 +0200)]
lavfi: add testsrc source
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Mon, 5 Sep 2011 16:16:13 +0000 (18:16 +0200)]
AVOptions: add documentation.
Anton Khirnov [Thu, 13 Oct 2011 06:21:45 +0000 (08:21 +0200)]
presets: update libx264 ffpresets
Use the native libx264 options and rename all the preset to use
the avpreset extension.
Michael Niedermayer [Wed, 19 Oct 2011 01:29:15 +0000 (03:29 +0200)]
mpeg12dec: Support invalid field motion types,
Fixes Ticket539
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Oct 2011 01:28:25 +0000 (03:28 +0200)]
mpeg12dec: assert no field frame mess
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Oct 2011 15:52:42 +0000 (17:52 +0200)]
mov: Raise ctts dts_shift threshold by 1
This fixes issue2246neu.mp4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Oct 2011 23:32:05 +0000 (01:32 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
sunrast: Check for out of bounds reads
lavc: rename AV_ER_* options to AV_EF_* and rename AGGRESSIVE to BUFFER
lavc: replace API-bump-triggered AVCodecContext field change with shorter, non-conflicting name
Add libvpx presets.
doc/avtools: add forgotten part to stream specifiers description
swscale: prevent overflow during initialization
g722: Add a fate test for the encoder
fate: Add a target for creating a 16000 Hz mono synthetic audio file
macosx: use the default surface on newer sdl
Conflicts:
ffplay.c
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Oct 2011 22:05:30 +0000 (00:05 +0200)]
vf_mp: Fix several incompatible pointer type warnings.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Oct 2011 22:04:33 +0000 (00:04 +0200)]
vf_unsharp: Fix false ‘src2’ may be used uninitialized in this function warning.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Oct 2011 22:03:56 +0000 (00:03 +0200)]
src_movie: Fix incompatible pointer type warning.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Oct 2011 22:03:13 +0000 (00:03 +0200)]
vf_deshake: Fix cast discards qualifiers from pointer target type warning.
And simplify the code in the process.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>