Michael Niedermayer [Wed, 25 Jul 2012 20:00:06 +0000 (22:00 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtmp: Add a new option 'rtmp_pageurl'
doc: Update the description of the rtmp_tcurl option
rtmp: Make the description of the rtmp_tcurl option more generic
libfdk-aacenc: add LATM/LOAS encapsulation support
sctp: add port missing error message
tcp: add port missing error message
avfilter: Fix printf format string conversion specifier
Conflicts:
libavcodec/version.h
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Jul 2012 19:35:48 +0000 (21:35 +0200)]
libvpxenc: switch to av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Jul 2012 19:35:30 +0000 (21:35 +0200)]
intrax8: asserts cleanup
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Samuel Pitoiset [Tue, 24 Jul 2012 14:29:40 +0000 (16:29 +0200)]
rtmp: Add a new option 'rtmp_pageurl'
This option specifies the URL of the web page in which the media
was embedded.
Signed-off-by: Martin Storsjö <martin@martin.st>
Samuel Pitoiset [Tue, 24 Jul 2012 14:29:39 +0000 (16:29 +0200)]
doc: Update the description of the rtmp_tcurl option
Signed-off-by: Martin Storsjö <martin@martin.st>
Samuel Pitoiset [Tue, 24 Jul 2012 14:29:38 +0000 (16:29 +0200)]
rtmp: Make the description of the rtmp_tcurl option more generic
Signed-off-by: Martin Storsjö <martin@martin.st>
Kieran Kunhya [Mon, 23 Jul 2012 16:20:04 +0000 (11:20 -0500)]
libfdk-aacenc: add LATM/LOAS encapsulation support
Signed-off-by: Martin Storsjö <martin@martin.st>
Jordi Ortiz [Tue, 24 Jul 2012 17:56:39 +0000 (19:56 +0200)]
sctp: add port missing error message
Without this patch a user a bit absent-minded may not notice that
the connection doesn't work because the port is missing.
Signed-off-by: Martin Storsjö <martin@martin.st>
Jordi Ortiz [Tue, 24 Jul 2012 17:59:53 +0000 (19:59 +0200)]
tcp: add port missing error message
Without this patch a user a bit absent-minded may not notice that
the connection doesn't work because the port is missing.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Wed, 25 Jul 2012 15:40:33 +0000 (17:40 +0200)]
hls: call avformat_find_stream_info()
This is needed to correctly demux h264 in ts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Jul 2012 15:39:25 +0000 (17:39 +0200)]
av_find_stream_info: skip flushing codecs and estimating timings if probe_size==0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Jul 2012 12:28:08 +0000 (14:28 +0200)]
fate: update avui test due to
commit
20e88d86182d9bb49112648d9a42849a7b17eacd
Fix avui stream-copy.
The native decoder and MPlayer's binary decoder only need the
APRG atom, QuickTime at least requires also the ARES atom and
four additional 0 bytes padding at the end of stsd.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Tue, 24 Jul 2012 07:43:02 +0000 (09:43 +0200)]
ffprobe: use av_guess_sample_aspect_ratio() for guessing the aspect ratio
This is consistent with what av_dump_format() does.
In particular, fix trac ticket #1568.
Stefano Sabatini [Tue, 24 Jul 2012 07:41:48 +0000 (09:41 +0200)]
lavf/avformat.h: fix verb person for av_guess_sample_aspect_ratio()
Prefer impersonal form over third person, consistent with the rest of
docs.
Stefano Sabatini [Sun, 22 Jul 2012 10:12:51 +0000 (12:12 +0200)]
lavfi/avfilter.h: add doxy for AVFilterLink.out_buf
Stefano Sabatini [Sun, 22 Jul 2012 09:24:27 +0000 (11:24 +0200)]
lavfi/avfilter.h: add doxy for AVFilterLink.cur_buf
Carl Eugen Hoyos [Wed, 25 Jul 2012 07:26:17 +0000 (09:26 +0200)]
Fix avui stream-copy.
The native decoder and MPlayer's binary decoder only need the
APRG atom, QuickTime at least requires also the ARES atom and
four additional 0 bytes padding at the end of stsd.
Diego Biurrun [Tue, 24 Jul 2012 21:58:59 +0000 (23:58 +0200)]
avfilter: Fix printf format string conversion specifier
libavfilter/avfilter.c:224:9: warning: format ‘%ld’ expects argument of type ‘long int’, but argument 5 has type ‘int’ [-Wformat]
Michael Niedermayer [Tue, 24 Jul 2012 15:34:13 +0000 (17:34 +0200)]
lavf: Set pos for all packets of AVSTREAM_PARSE_FULL_RAW files.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 14 Jul 2012 23:50:02 +0000 (01:50 +0200)]
imgconvert: Implement avcodec_find_best_pix_fmt_of_list()
The old avcodec_find_best_pix_fmt() was insufficient due to 64 pix_fmt limit.
In ffmpeg this problem has been solved long ago through avcodec_find_best_pix_fmt2()
Today libav has added a incompatible modified version of avcodec_find_best_pix_fmt2()
under the same name, thus again breaking ABI/API ...
The avcodec_find_best_pix_fmt_of_list() added in this commit here makes the libav
API available to ffmpeg users too.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Piotr Bandurski [Tue, 24 Jul 2012 09:42:55 +0000 (11:42 +0200)]
riff: make the G723.1 in wav output compatible with WMP/msacm codec
Attached patch (together with demuxing patch) allows WMP/msacm G723.1 codec decode files encoded by FFmpeg.
Tested with both 6400 and 5333 mode
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 24 Jul 2012 15:33:15 +0000 (17:33 +0200)]
lavf: factor AVStream st out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 24 Jul 2012 15:29:47 +0000 (17:29 +0200)]
parse_packet: reset pkt->pos after it has been used
This should have no effect as it was not used in this case
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Bradshaw [Thu, 19 Jul 2012 03:48:39 +0000 (21:48 -0600)]
libopenjpegenc: set numresolution max to INT_MAX
OpenJPEG doesn't have a max lowres limit, so don't enforce an arbitrary one.
Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 24 Jul 2012 18:43:07 +0000 (20:43 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtmp: Add credit/copyright to librtmp authors for parts of the RTMPE code
rtmp: Move the CONFIG_ condition into the if conditions
aac: Mention abbreviation as well in long_name
build: Skip compiling rtmpdh.h if ffrtmpcrypt protocol is not enabled
doc: Add Git configuration section
configure: Add a dependency on https for rtmpts
rtp: Only choose static payload types if the sample rate and channels are right
Conflicts:
doc/git-howto.texi
libavformat/rtmpproto.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Mon, 23 Jul 2012 14:58:22 +0000 (16:58 +0200)]
ffmpeg: keep packet/frame availability in global structures.
This replaces the use of the no_packet and no_frame arrays.
Piotr Bandurski [Mon, 23 Jul 2012 22:40:42 +0000 (00:40 +0200)]
riff: fix remuxing of G723_1 in wav
Attached patch fixes remuxing of G723.1 in wav, so the output is playable by WMP.
(It's still not enough for encoding - probably some extradata should be added to the output file
to make it playable by WMP/win codec)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Tue, 24 Jul 2012 13:01:36 +0000 (16:01 +0300)]
rtmp: Add credit/copyright to librtmp authors for parts of the RTMPE code
Our implementation of RTMPE is heavily based on librtmp.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Tue, 24 Jul 2012 12:55:30 +0000 (14:55 +0200)]
Revert "lavf: count skipped samples for initial timestamps."
This reverts commit
885fc058655efee94203314984ce99b301fdebb1.
This commit caused timestamps in case of generic seeking to become
inconsistent.
Samuel Pitoiset [Tue, 24 Jul 2012 11:46:28 +0000 (13:46 +0200)]
rtmp: Move the CONFIG_ condition into the if conditions
This makes sure these calls are removed by dead code elimination
even if optimization is disabled. This fixes building without
crypto libraries without optimization.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Tue, 24 Jul 2012 03:17:36 +0000 (05:17 +0200)]
iffdec: Fix integer overflow.
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 24 Jul 2012 02:52:58 +0000 (04:52 +0200)]
vc1dec: dont apply the loop filter on fields
Fixes read of uninitialized memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 24 Jul 2012 02:05:18 +0000 (04:05 +0200)]
vc1dec: dont attempt error concealment on field pictures.
This is not implemented and doesnt work.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 24 Jul 2012 02:04:54 +0000 (04:04 +0200)]
ec: print picture type with concealment error message.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Tue, 24 Jul 2012 00:14:38 +0000 (02:14 +0200)]
aac: Mention abbreviation as well in long_name
Most people know the codec as "AAC" and not "Advanced Audio Coding".
Alexander Strasser [Wed, 11 Jul 2012 21:12:00 +0000 (23:12 +0200)]
tools/bisect-create: Support "bisect run"
Make it possible to use the run bisect sub command. As with all
other ffbisect commands, revisions that do not contain the needed
tools are skipped.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
yang [Mon, 23 Jul 2012 22:51:10 +0000 (00:51 +0200)]
dsputil_mmx: fix incorrect assembly code
In file libavcodec/x86/dsputil_mmx.c, function ff_put_pixels_clamped_mmx(), there are two assembly code blocks. In the first block (in the unrolled loop), the instructions "movq 8%3, %%mm1 \n\t" etc have problem.
For above instruction, it is clear what the programmer wants: a load from p + 8. But this assembly code doesn’t guarantee that. It only works if the compiler puts p in a register to produce an instruction like this: “movq 8(%edi), %mm1”. During compiler optimization, it is possible that the compiler will be able to constant propagate into p. Suppose p = &x[10000]. Then operand 3 can become 10000(%edi), where %edi holds &x. And the instruction becomes “movq 810000(%edx)”. That is, it will stride by 810000 instead of 8.
This will cause the segmentation fault.
This error was fixed in the second block of the assembly code, but not in the unrolled loop.
How to reproduce:
This error is exposed when we build the ffmpeg using Intel C++ Compiler, IPO+PGO optimization. The ffmpeg was crashed when decoding a mjpeg video.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Mon, 23 Jul 2012 21:53:34 +0000 (23:53 +0200)]
build: Skip compiling rtmpdh.h if ffrtmpcrypt protocol is not enabled
The ffrtmpcrypt protocol depends on external libraries, which are
also required to compile the header file.
Michael Niedermayer [Mon, 23 Jul 2012 22:11:14 +0000 (00:11 +0200)]
rtmpproto: fix compilation without optimizations
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Mon, 23 Jul 2012 13:38:45 +0000 (16:38 +0300)]
configure: Add a dependency on https for rtmpts
The rtmpts protocol uses https implicitly, via the ffrtmphttp
protocol, but the ffrtmphttp protocol is also useable for plain
rtmpt without https, so the dependency needs to be added here instead.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diego Biurrun [Sun, 22 Jul 2012 13:11:25 +0000 (15:11 +0200)]
doc: Add Git configuration section
Michael Niedermayer [Mon, 23 Jul 2012 20:18:16 +0000 (22:18 +0200)]
cavsdec: switch to av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Jul 2012 20:17:52 +0000 (22:17 +0200)]
libavcodec/bitstream: switch to av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Mon, 23 Jul 2012 21:15:23 +0000 (21:15 +0000)]
cosmetics: iff: split very long line
Also while here sort chunk ids.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Carl Eugen Hoyos [Mon, 23 Jul 2012 21:44:13 +0000 (23:44 +0200)]
Fix typo in v410 decoder.
Martin Storsjö [Mon, 23 Jul 2012 13:38:45 +0000 (16:38 +0300)]
configure: Add a dependency on https for rtmpts
The rtmpts protocol uses https implicitly, via the ffrtmphttp
protocol, but the ffrtmphttp protocol is also useable for plain
rtmpt without https, so the dependency needs to be added here instead.
Signed-off-by: Martin Storsjö <martin@martin.st>
Adriano Pallavicino [Tue, 17 Jul 2012 07:51:13 +0000 (09:51 +0200)]
rtp: Only choose static payload types if the sample rate and channels are right
If using a different sample rate or number of channels, use a dynamic
payload type instead, where the parameters are passed in the SDP.
G722 is a special case where the normal rules don't apply.
Signed-off-by: Martin Storsjö <martin@martin.st>
Paul B Mahol [Mon, 23 Jul 2012 21:00:17 +0000 (21:00 +0000)]
cosmetics: iff: fix typo
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Nicolas George [Mon, 23 Jul 2012 20:20:31 +0000 (22:20 +0200)]
vf_deshake: set cur_buf to NULL.
Fix a segfault.
Michael Niedermayer [Mon, 23 Jul 2012 20:04:35 +0000 (22:04 +0200)]
fate: enable fate-vc1_sa10143
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Mon, 23 Jul 2012 19:53:33 +0000 (19:53 +0000)]
vf_colormatrix: add missing semicolon
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Mon, 23 Jul 2012 19:04:06 +0000 (21:04 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
v410dec: Implement explode mode support
zerocodec: fix direct rendering.
wav: init st to NULL to avoid a false-positive warning.
wavpack: set bits_per_raw_sample for S32 samples to properly identify 24-bit
h264: refactor NAL decode loop
RTMPTE protocol support
RTMPE protocol support
rtmp: Add ff_rtmp_calc_digest_pos()
rtmp: Rename rtmp_calc_digest to ff_rtmp_calc_digest and make it global
swscale: add missing HAVE_INLINE_ASM check.
lavfi: place x86 inline assembly under HAVE_INLINE_ASM.
vc1: Add a test for interlaced field pictures
swscale: Mark all init functions as av_cold
swscale: x86: Drop pointless _mmx suffix from filenames
lavf: use conditional notation for default codec in muxer declarations.
swscale: place inline assembly bilinear scaler under HAVE_INLINE_ASM.
dsputil: ppc: cosmetics: pretty-print
dsputil: x86: add SHUFFLE_MASK_W macro
configure: respect CC_O setting in check_cc
Conflicts:
Changelog
configure
libavcodec/v410dec.c
libavcodec/zerocodec.c
libavformat/asfenc.c
libavformat/version.h
libswscale/utils.c
libswscale/x86/swscale.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Justin Ruggles [Sat, 26 May 2012 18:50:02 +0000 (14:50 -0400)]
swr: resampling: add filter type and Kaiser window beta to AVOptions
Derek Buitenhuis [Mon, 23 Jul 2012 15:03:58 +0000 (11:03 -0400)]
v410dec: Implement explode mode support
Try and decode broken files, but still fail if explode
mode is enabled.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Reimar Döffinger [Sat, 21 Jul 2012 11:22:04 +0000 (13:22 +0200)]
zerocodec: fix direct rendering.
Set picture type before calling get_buffer.
This allows the DR application to make better decisions.
It also fixes a resource leak in case of missing reference frames
since it would call get_buffer but never release_buffer.
Also use FFSWAP to ensure that the AVFrame is properly initialized
in the next get_buffer (in particular that data[0] is NULL).
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Clément Bœsch [Thu, 1 Sep 2011 18:06:05 +0000 (20:06 +0200)]
wav: init st to NULL to avoid a false-positive warning.
If st is NULL, it means no 'fmt ' tag is found, but 'data' tag (which
needs a previous 'fmt ' tag to be parsed correctly and st initialized)
check will make sure st is never dereferenced in that case.
Fixes warning:
libavformat/wav.c: In function ‘wav_read_header’:
libavformat/wav.c:499:44: warning: ‘st’ may be used uninitialized in this function [-Wmaybe-uninitialized]
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Hendrik Leppkes [Fri, 16 Dec 2011 21:43:35 +0000 (22:43 +0100)]
wavpack: set bits_per_raw_sample for S32 samples to properly identify 24-bit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Nicolas George [Wed, 18 Jul 2012 23:03:20 +0000 (01:03 +0200)]
src_movie: implement multiple outputs.
The audio and video code paths were too different,
most of the decoding has been rewritten.
Nicolas George [Fri, 20 Jul 2012 22:48:23 +0000 (00:48 +0200)]
buffersrc: use avfilter_get_buffer_ref_from_frame.
Nicolas George [Fri, 20 Jul 2012 22:47:52 +0000 (00:47 +0200)]
lavfi: add avfilter_get_buffer_ref_from_frame.
Ronald S. Bultje [Mon, 23 Jul 2012 03:46:10 +0000 (20:46 -0700)]
h264: refactor NAL decode loop
Write out the NAL decoding loops in full so that they are easier
to parse for a preprocessor without it having to be aware of macros
or other such things in C code.
This also makes the code more readable.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Peter Ross [Sun, 22 Jul 2012 04:25:42 +0000 (14:25 +1000)]
tls: user documentation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Samuel Pitoiset [Fri, 20 Jul 2012 14:36:47 +0000 (16:36 +0200)]
RTMPTE protocol support
Signed-off-by: Martin Storsjö <martin@martin.st>
Samuel Pitoiset [Thu, 19 Jul 2012 12:13:58 +0000 (14:13 +0200)]
RTMPE protocol support
This adds two protocols, but one of them is an internal implementation
detail just used as an abstraction layer/generalization in the code. The
RTMPE protocol implementation uses ffrtmpcrypt:// as an alternative to the
tcp:// protocol. This allows moving most of the lower level logic out
from the higher level generic rtmp code.
Signed-off-by: Martin Storsjö <martin@martin.st>
Samuel Pitoiset [Thu, 5 Jul 2012 11:06:07 +0000 (13:06 +0200)]
rtmp: Add ff_rtmp_calc_digest_pos()
This function is used for calculating digest position for RTMP handshake
packets.
Signed-off-by: Martin Storsjö <martin@martin.st>
Samuel Pitoiset [Thu, 5 Jul 2012 11:05:46 +0000 (13:05 +0200)]
rtmp: Rename rtmp_calc_digest to ff_rtmp_calc_digest and make it global
Signed-off-by: Martin Storsjö <martin@martin.st>
Stefano Sabatini [Mon, 23 Jul 2012 12:57:15 +0000 (14:57 +0200)]
lavfi/showwaves: do not set on outlink->out_buf the sent video frame
The video frame reference is passed along the filterchain, and is not
possessed anymore by the filter. If out_buf is not set to NULL, it will
be freed by ff_end_frame() causing a crash.
Peter Ross [Mon, 23 Jul 2012 12:04:47 +0000 (14:04 +0200)]
iff: set ham palette alpha to 0xFF
This addresses the problem that some HAM pictures were decoded with
complete transparency as described in the 'iff: ANIM suppport ' thread
on ffmpeg-devel. The decoder was already setting alpha correctly for
CMAP palettes, just not HAM palettes.
Michael Niedermayer [Mon, 23 Jul 2012 11:44:05 +0000 (13:44 +0200)]
vf_overlay: fix missed return
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Mon, 23 Jul 2012 09:44:48 +0000 (11:44 +0200)]
lavfi: change "transmedia" into "multimedia".
Nicolas George [Mon, 16 Jul 2012 23:05:05 +0000 (01:05 +0200)]
lavfi: add concat filter.
Nicolas George [Sat, 21 Jul 2012 20:54:08 +0000 (22:54 +0200)]
ffmpeg: select input file based on output time.
Filters can change the timings, so input files must not
necessarily be read at the same rythm. This patch select
the input file to read based on the timestamp at output
instead of input. With complex filter graphs, finding the
input for a given output is done by making a request and
checking to what buffer source it has been forwarded.
Ronald S. Bultje [Sun, 22 Jul 2012 20:55:58 +0000 (13:55 -0700)]
swscale: add missing HAVE_INLINE_ASM check.
The function called in this block is under HAVE_INLINE_ASM itself also.
Ronald S. Bultje [Sun, 22 Jul 2012 00:03:12 +0000 (17:03 -0700)]
lavfi: place x86 inline assembly under HAVE_INLINE_ASM.
This allows compiling this code using compilers that do not understand
gcc-style inline assembly.
Mashiat Sarker Shakkhar [Mon, 16 Jul 2012 07:45:23 +0000 (07:45 +0000)]
vc1: Add a test for interlaced field pictures
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Michael Niedermayer [Mon, 23 Jul 2012 02:20:15 +0000 (04:20 +0200)]
libschroedingerenc: remove assert related to the old API.
The assert is no longer needed as the buffer is allocated after
the size is known now.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Jul 2012 02:00:23 +0000 (04:00 +0200)]
libvorbisenc: switch to av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Jul 2012 02:00:01 +0000 (04:00 +0200)]
libschroedingerenc: switch to av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Jul 2012 01:48:10 +0000 (03:48 +0200)]
g723.1dec: Make postfilter user switchable
Code from qatar (
55c3a4f617171ad1138df684cbafa570807bc6a9)
Author of the code was probably Mohamed or Kostya
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Jul 2012 01:45:12 +0000 (03:45 +0200)]
g723.1: various cosmetics and changes that should have no user vissible effect.
code from qatar (
55c3a4f617171ad1138df684cbafa570807bc6a9)
Author of the code was probably Mohamed or Kostya
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Sun, 22 Jul 2012 10:29:28 +0000 (12:29 +0200)]
swscale: Mark all init functions as av_cold
Diego Biurrun [Sat, 21 Jul 2012 20:33:03 +0000 (22:33 +0200)]
swscale: x86: Drop pointless _mmx suffix from filenames
The files do not contain only MMX code.
Ronald S. Bultje [Sat, 21 Jul 2012 23:44:26 +0000 (16:44 -0700)]
lavf: use conditional notation for default codec in muxer declarations.
This removes the use of macro nesting in these code constructs, which
makes it easier to parse in pre-processors.
Ronald S. Bultje [Sun, 22 Jul 2012 21:01:21 +0000 (14:01 -0700)]
swscale: place inline assembly bilinear scaler under HAVE_INLINE_ASM.
Michael Niedermayer [Sun, 22 Jul 2012 21:59:57 +0000 (23:59 +0200)]
Merge remote-tracking branch 'dwbuiten/master'
* dwbuiten/master:
wav: Add check for 'fmt' tag in SMV code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Jul 2012 20:57:02 +0000 (22:57 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
FATE: fix the asyncts test
build: Drop gcc-specific warning flag from header compilation rule
FATE: add a test for the asyncts audio filter.
matroskadec: return more correct error code on read error.
buffersrc: check ff_get_audio_buffer() for errors.
lavfi: check all ff_get_video_buffer() calls for errors.
lavfi: check all avfilter_ref_buffer() calls for errors.
vf_select: avoid an unnecessary avfilter_ref_buffer().
buffersrc: avoid creating unnecessary buffer reference
lavfi: use avfilter_unref_bufferp() where appropriate.
vf_fps: add more error checks.
vf_fps: fix a memleak on malloc failure.
lavfi: check all ff_start_frame/draw_slice/end_frame calls for errors
lavfi: add error handling to end_frame().
lavfi: add error handling to draw_slice().
lavfi: add error handling to start_frame().
Conflicts:
Makefile
ffplay.c
libavfilter/buffersrc.c
libavfilter/vf_boxblur.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_frei0r.c
libavfilter/vf_hflip.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavfilter/video.c
libavfilter/vsrc_color.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Derek Buitenhuis [Mon, 16 Jul 2012 18:17:52 +0000 (14:17 -0400)]
wav: Add check for 'fmt' tag in SMV code
If there is a 'SMV0' tag, but no 'fmt' tag, it is possible that
'st' got used as NULL.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Justin Ruggles [Sun, 22 Jul 2012 18:37:24 +0000 (14:37 -0400)]
dsputil: ppc: cosmetics: pretty-print
Jason Garrett-Glaser [Fri, 20 Jul 2012 22:33:06 +0000 (18:33 -0400)]
dsputil: x86: add SHUFFLE_MASK_W macro
Simplifies pshufb masks that operate on words.
Michael Niedermayer [Sun, 22 Jul 2012 20:10:41 +0000 (22:10 +0200)]
Merge commit '
1470ce21cec5ee26e106e2a884c26bbf84e5aaea'
* commit '
1470ce21cec5ee26e106e2a884c26bbf84e5aaea':
Bump libavcodec and libavformat minor versions for G.723.1 decoder and demuxer
G.723.1 demuxer and decoder
Add a shift parameter to celp_lp_synthesis_filter()
libopenjpeg: K&R formatting cosmetics
yadif: use emms_c() instead of inline assembly for emms invocations.
ac3: don't use different names for option tables in the template file.
lavfi: use const for AVFilterPad declarations in all filters.
adpcm: don't duplicate identical AVSampleFmt array for each encoder.
configure: cosmetics: Group test dependencies together
configure: add more passthrough flags in tms470 filter
configure: move flag filtering functions out of if/else blocks
Conflicts:
Changelog
configure
doc/general.texi
libavcodec/Makefile
libavcodec/ac3enc_fixed.c
libavcodec/allcodecs.c
libavcodec/eac3enc.c
libavcodec/g723_1.c
libavcodec/g723_1_data.h
libavcodec/libopenjpegdec.c
libavcodec/libopenjpegenc.c
libavcodec/v210dec.h
libavcodec/version.h
libavfilter/af_anull.c
libavfilter/asrc_anullsrc.c
libavfilter/f_settb.c
libavfilter/fifo.c
libavfilter/split.c
libavfilter/src_movie.c
libavfilter/vf_aspect.c
libavfilter/vf_blackframe.c
libavfilter/vf_boxblur.c
libavfilter/vf_copy.c
libavfilter/vf_crop.c
libavfilter/vf_cropdetect.c
libavfilter/vf_delogo.c
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_fieldorder.c
libavfilter/vf_format.c
libavfilter/vf_frei0r.c
libavfilter/vf_gradfun.c
libavfilter/vf_hflip.c
libavfilter/vf_hqdn3d.c
libavfilter/vf_libopencv.c
libavfilter/vf_lut.c
libavfilter/vf_null.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_pixdesctest.c
libavfilter/vf_scale.c
libavfilter/vf_select.c
libavfilter/vf_setpts.c
libavfilter/vf_showinfo.c
libavfilter/vf_slicify.c
libavfilter/vf_transpose.c
libavfilter/vf_unsharp.c
libavfilter/vf_vflip.c
libavfilter/vf_yadif.c
libavfilter/vsrc_color.c
libavfilter/vsrc_testsrc.c
libavformat/Makefile
libavformat/allformats.c
libavformat/g723_1.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Fri, 20 Jul 2012 21:22:18 +0000 (22:22 +0100)]
configure: respect CC_O setting in check_cc
Use compiler-specific replacements for the -o flag in check_cc.
This makes tests work properly with compilers using non-standard
flags.
The tms470 flags are updated to work with this scheme.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Peter Ross [Sun, 22 Jul 2012 04:25:12 +0000 (14:25 +1000)]
tls: TLS/SSL server
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Sun, 22 Jul 2012 04:25:02 +0000 (14:25 +1000)]
tls: parse uri path options to underlying tcp URLContext
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Sun, 22 Jul 2012 04:24:53 +0000 (14:24 +1000)]
tls: verify option
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Sun, 22 Jul 2012 04:24:43 +0000 (14:24 +1000)]
tls: cafile, cert, key options
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Sun, 22 Jul 2012 15:56:59 +0000 (17:56 +0200)]
overlay: clear cur_buf on main input link.
A reference is kept in the queue and freed after use.
Anton Khirnov [Sun, 22 Jul 2012 09:29:06 +0000 (11:29 +0200)]
FATE: fix the asyncts test
Nellymoser is float, so use oneoff comparison instead of md5.
Peter Ross [Sun, 22 Jul 2012 10:51:53 +0000 (20:51 +1000)]
av_url_split: dont let '/' char whallop '?' char
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Sun, 22 Jul 2012 10:29:22 +0000 (12:29 +0200)]
doc: declare encoding for texi2html.
It adds the following header to the HTML files:
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
which helps some browsers to display correctly the few non-ASCII
characters in the doc.
Diego Biurrun [Sat, 21 Jul 2012 23:12:24 +0000 (01:12 +0200)]
build: Drop gcc-specific warning flag from header compilation rule
The flag was added to avoid excessive warning spam, but nowadays those
warnings no longer occur in such large numbers as to require silencing.
Besides, gcc-specific flags do not belong in the Makefiles.