OSDN Git Service
Michael Niedermayer [Mon, 11 Jun 2012 19:55:27 +0000 (21:55 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtmp: Do not send extension for flv files
rtmp: support connection parameters
doc: Add documentation for the newly added rtmp_* options
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 11 Jun 2012 19:41:03 +0000 (21:41 +0200)]
pngenc: use av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 11 Jun 2012 19:40:43 +0000 (21:40 +0200)]
4xm: use av_assert()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nedeljko Babic [Mon, 4 Jun 2012 16:02:56 +0000 (18:02 +0200)]
Optimization of AMR NB and WB decoders for MIPS
AMR NB and WB decoders are optimized for MIPS architecture.
Appropriate Makefiles are changed accordingly.
Cnfigure script is changed in order to support optimizations.
Optimizations are enabled by default when compiling is done for
mips architecture.
Appropriate cflags are automatically set.
Support for several mips CPUs is added in configure script.
New ffmpeg options are added for disabling optimizations.
The FFMPEG option --disable-mipsfpu disables MIPS floating point
optimizations.
The FFMPEG option --disable-mips32r2 disables MIPS32R2
optimizations.
The FFMPEG option --disable-mipsdspr1 disables MIPS DSP ASE R1
optimizations.
The FFMPEG option --disable-mipsdspr2 disables MIPS DSP ASE R2
optimizations.
Signed-off-by: Nedeljko Babic <nbabic@mips.com>
Reviewed-by: Vitor Sessak <vitor1001@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Mon, 11 Jun 2012 18:55:09 +0000 (18:55 +0000)]
Remove eightsvx_raw decoder line
Decoder have been renamed to pcm_s8_planar long ago.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Mon, 11 Jun 2012 18:14:22 +0000 (20:14 +0200)]
flvenc: use av_assert instead of assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 11 Jun 2012 18:13:31 +0000 (20:13 +0200)]
rv20enc: use av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Samuel Pitoiset [Thu, 7 Jun 2012 15:46:34 +0000 (17:46 +0200)]
rtmp: Do not send extension for flv files
This fixes bugzilla bug #304.
Signed-off-by: Martin Storsjö <martin@martin.st>
Samuel Pitoiset [Fri, 8 Jun 2012 11:16:34 +0000 (13:16 +0200)]
rtmp: support connection parameters
Allow using connection parameters in order to append arbitrary
AMF data like "B:1 S:authMe O:1 NN:code:1.23 NS:flag:ok O:0" to the
Connect message. You can pass these parameters through the -rtmp_conn
option.
Signed-off-by: Martin Storsjö <martin@martin.st>
Samuel Pitoiset [Fri, 8 Jun 2012 11:15:21 +0000 (13:15 +0200)]
doc: Add documentation for the newly added rtmp_* options
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Mon, 11 Jun 2012 09:47:59 +0000 (11:47 +0200)]
random_seed: rewrite generic code.
The new code is faster and reuses the previous state in case of
multiple calls. For testing the iterations are reduced and several
entropy sources are disabled.
Its based on SHA-1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Mon, 11 Jun 2012 08:57:23 +0000 (10:57 +0200)]
Make png-in-mov QuickTime-compatible for more colour-spaces.
Reported and tested by ami_stuff.
See ticket #1191.
Clément Bœsch [Mon, 4 Jun 2012 10:06:23 +0000 (12:06 +0200)]
mov: export orphan tmcd track metadata to global format metadata.
Clément Bœsch [Mon, 4 Jun 2012 09:10:09 +0000 (11:10 +0200)]
mov: copy timecode metadata from tmcd track to the related video stream.
Apple softwares seem not to add a tref for the timecode (the next commit
fixes this issue), but at least FFmpeg does.
This can be used to generate a sample that demonstrates the feature:
./ffmpeg -f lavfi -i testsrc \
-f lavfi -i mptestsrc \
-f lavfi -i rgbtestsrc \
-map 0 -map 1 -map 2 \
-metadata:s:0 timecode=00:00:00:12 \
-metadata:s:2 timecode=01:02:12:20 \
-t 10 -y out.mov
./ffprobe out.mov
The timecode metadata being transmitted to the video streams, it can be
kept while transmuxed/transcoded.
Clément Bœsch [Mon, 4 Jun 2012 09:09:31 +0000 (11:09 +0200)]
mov: parse tref atom.
Clément Bœsch [Mon, 5 Mar 2012 07:51:08 +0000 (08:51 +0100)]
movenc: add timecode track support.
Clément Bœsch [Thu, 31 May 2012 07:31:04 +0000 (09:31 +0200)]
riff: add ISMP/timecode tag.
Michael Niedermayer [Mon, 11 Jun 2012 01:00:28 +0000 (03:00 +0200)]
ffmpeg: allow overriding framerate for stream copy
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Zern [Sun, 10 Jun 2012 21:15:20 +0000 (14:15 -0700)]
libvpxenc: add support for forced key frames
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Jun 2012 21:36:22 +0000 (23:36 +0200)]
rangecoder: use av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Jun 2012 21:35:29 +0000 (23:35 +0200)]
amrnbdec: use av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Jun 2012 21:27:17 +0000 (23:27 +0200)]
j2k: remove unreachable assert()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Jun 2012 19:34:15 +0000 (21:34 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libmp3lame: add missing layout terminator
avconv: multithreaded demuxing.
Bump lavu minor and add an APIChanges entry for audioconvert functions.
audioconvert: add a function for extracting the channel with the given index
audioconvert: add a function for getting the name of a single channel.
audioconvert: add a function for getting channel's index in layout
audioconvert: use av_popcount64 in av_get_channel_layout_nb_channels
vf_libopencv: add missing headers.
iac: add missing dependency
Conflicts:
configure
doc/APIchanges
ffmpeg.c
libavcodec/libmp3lame.c
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Jun 2012 18:45:55 +0000 (20:45 +0200)]
dct-test: fix alignment in ff_prores_idct_put_10_sse2()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Jun 2012 16:14:51 +0000 (18:14 +0200)]
postprocess: fix another void returning void function.
lets hope this makes suncc happy finally ...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sun, 10 Jun 2012 15:22:52 +0000 (17:22 +0200)]
lavfi: fix signature for default_filter_name()
Return a const char *, fix warnings:
libavfilter/avfilter.c: In function ‘default_filter_name’:
libavfilter/avfilter.c:414:5: warning: return discards ‘const’ qualifier from pointer target type [enabled by default]
libavfilter/avfilter.c: At top level:
libavfilter/avfilter.c:419:5: warning: initialization from incompatible pointer type [enabled by default]
libavfilter/avfilter.c:419:5: warning: (near initialization for ‘avfilter_class.item_name’) [enabled by default]
Michael Niedermayer [Sun, 10 Jun 2012 14:50:06 +0000 (16:50 +0200)]
mpegtsenc: prevent pcr_packet_period==0
a period of 1 is the smallest that makes sense
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Jun 2012 13:38:11 +0000 (15:38 +0200)]
tiffenc: use av_assert()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 31 May 2012 22:07:36 +0000 (00:07 +0200)]
libmp3lame: add missing layout terminator
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Nicolas George [Sun, 10 Jun 2012 08:53:03 +0000 (10:53 +0200)]
vf_fps: set frame_rate.
Nicolas George [Sun, 10 Jun 2012 08:40:33 +0000 (10:40 +0200)]
vf_tile: update deprecated functions.
Nicolas George [Sun, 10 Jun 2012 08:35:17 +0000 (10:35 +0200)]
vf_tile: set frame_rate.
Nicolas George [Sat, 9 Jun 2012 19:03:18 +0000 (21:03 +0200)]
sdl: fix aspect ratio computations.
The rounding was wrong due to incorrect ue of floats,
changed to rationals and av_rescale.
The results were not properly passed to SDL.
Nicolas George [Sat, 9 Jun 2012 10:28:44 +0000 (12:28 +0200)]
sdl: fix overlay size.
The size passed to SDL_CreateYUVOverlay is the size
of the video in pixels, it must not take the aspect ratio
into account.
Nicolas George [Sat, 9 Jun 2012 09:28:44 +0000 (11:28 +0200)]
sdl: add AVFMT_VARIABLE_FPS and AVFMT_NOTIMESTAMPS.
It allows vsync to be automatically set to passthrough.
Anton Khirnov [Sat, 2 Jun 2012 05:26:41 +0000 (07:26 +0200)]
avconv: multithreaded demuxing.
When there are multiple input files, run demuxing for each input file in
a separate thread, so reading packets does not block.
This is useful for achieving low latency when reading from multiple
(possibly slow) input streams.
Anton Khirnov [Mon, 28 May 2012 19:40:44 +0000 (21:40 +0200)]
Bump lavu minor and add an APIChanges entry for audioconvert functions.
Anton Khirnov [Mon, 28 May 2012 10:20:57 +0000 (12:20 +0200)]
audioconvert: add a function for extracting the channel with the given index
Anton Khirnov [Mon, 28 May 2012 06:39:10 +0000 (08:39 +0200)]
audioconvert: add a function for getting the name of a single channel.
Anton Khirnov [Mon, 28 May 2012 06:16:40 +0000 (08:16 +0200)]
audioconvert: add a function for getting channel's index in layout
Anton Khirnov [Sat, 9 Jun 2012 18:14:12 +0000 (20:14 +0200)]
audioconvert: use av_popcount64 in av_get_channel_layout_nb_channels
Anton Khirnov [Sat, 9 Jun 2012 14:00:16 +0000 (16:00 +0200)]
vf_libopencv: add missing headers.
Fix build after
b74a1da4.
Kostya Shishkov [Sat, 9 Jun 2012 17:19:07 +0000 (19:19 +0200)]
iac: add missing dependency
Michael Niedermayer [Sun, 10 Jun 2012 01:49:31 +0000 (03:49 +0200)]
bprint-test: avoid z modifier, mingw fails with it
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Jun 2012 01:30:12 +0000 (03:30 +0200)]
sink_buffer: dont return void from void functions.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Jun 2012 01:26:24 +0000 (03:26 +0200)]
libavcodec/x86/rv40dsp_init.c: add missing HAVE_YASM
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Jun 2012 01:23:44 +0000 (03:23 +0200)]
libavcodec/x86/h264dsp_mmx.c: add forgotten HAVE_YASM
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Jun 2012 01:20:27 +0000 (03:20 +0200)]
libavcodec/x86/dwt.c: move some missed things under HAVE_YASM
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Jun 2012 01:15:38 +0000 (03:15 +0200)]
dct-test: fix #if for ff_prores_idct_put_10_sse2()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Jun 2012 01:08:19 +0000 (03:08 +0200)]
libavfilter: make ff_null_start_frame_keep_ref() a non static inline function.
Its only used through the start_frame pointer and thus cannot be inlined easily.
It also appears to break compilation with some unidentified compiler on darwin.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Jun 2012 00:57:45 +0000 (02:57 +0200)]
fate-acodec-dca2: add bitexact flag
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Jun 2012 00:57:25 +0000 (02:57 +0200)]
enc_dec_pcm: add bitexact flag
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Jun 2012 00:38:01 +0000 (02:38 +0200)]
cmdutils: dont return void from a void function
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Jun 2012 00:12:20 +0000 (02:12 +0200)]
h264: use externally provided dimensions when they appear to be more correct.
This is based on:
commit
30f515091c323da59c0f1b533703dedca2f4b95d
Author: Mans Rullgard <mans@mansr.com>
h264: allow cropping to AVCodecContext.width/height
The above commit is not taken as is as its buggy (incorrect handling of
the interlaced case) and didnt apply cleanly.
Fixes ticket156
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sat, 9 Jun 2012 23:29:41 +0000 (23:29 +0000)]
libopenjpegdec: make use of FF_ARRAY_ELEMS
Signed-off-by: Paul B Mahol <onemda@gmail.com>
James Zern [Sat, 9 Jun 2012 21:40:51 +0000 (14:40 -0700)]
libvpxenc: add VP8E_SET_MAX_INTRA_BITRATE_PCT mapping
defines 'max-intra-rate' in line with vpxenc param
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sat, 9 Jun 2012 22:00:33 +0000 (00:00 +0200)]
lavu/timestamp: remove duplicate definition of AV_TS_MAX_STRING_SIZE
Paul B Mahol [Sat, 9 Jun 2012 18:33:29 +0000 (18:33 +0000)]
libopenjpeg: YUVA422P and YUVA444P support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sat, 9 Jun 2012 18:30:17 +0000 (20:30 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: allow cropping to AVCodecContext.width/height
mov: set AVCodecContext.width/height for h264
iac: generate codec tables as they are supposed to be
indeo4: handle frame type 1 properly
lavu: change versioning script to include all av* prefixed symbols
Conflicts:
libavcodec/h264.c
libavutil/libavutil.v
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sat, 9 Jun 2012 18:15:50 +0000 (18:15 +0000)]
ffv1enc: add yuva422p to .pix_fmts
This was forgotten in
4e4634aa160ad0e27bee5e7809edbfcace08eba6.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sat, 9 Jun 2012 18:09:51 +0000 (20:09 +0200)]
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: fix return value of get_video_frame if avcodec_decode_video fails
Merged-by: Michael Niedermayer <michaelni@gmx.at>
J. Bohl [Sat, 9 Jun 2012 15:45:41 +0000 (17:45 +0200)]
remove unreferenced table "dnxhd_1238_ac_index_flag" (empty curly braces did not compile with ICL12.1)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sat, 9 Jun 2012 18:06:09 +0000 (18:06 +0000)]
libopenjpegdec: unbreak yuva420p support
Regression introduced in
b7a928b2d1563575a8d9ec5aa606f735620b38ab.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Marton Balint [Sat, 9 Jun 2012 17:44:58 +0000 (19:44 +0200)]
ffplay: fix return value of get_video_frame if avcodec_decode_video fails
Signed-off-by: Marton Balint <cus@passwd.hu>
Paul B Mahol [Sat, 9 Jun 2012 12:12:41 +0000 (12:12 +0000)]
colorspace-test: add few more tests
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Fri, 8 Jun 2012 21:48:35 +0000 (23:48 +0200)]
float_dsp.c: Restore author attribution that was removed by libav while moving code to libavutil
Original code comes from:
commit
eb4825b5d43bb6ecfae4d64688f9e2d2ac075263
Author: Loren Merritt <lorenm@u.washington.edu>
Date: Thu Aug 10 19:06:25 2006 +0000
sse and 3dnow implementations of float->int conversion and mdct windowing.
15% faster vorbis.
and
commit
0bde73d907dbe684e01bafc979bf4a04ddeace1d
Author: Michael Niedermayer <michaelni@gmx.at>
Date: Tue May 17 19:02:43 2005 +0000
Vorbis decoder by (Balatoni Denes | dbalatoni programozo hu)
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 Jun 2012 21:35:35 +0000 (23:35 +0200)]
x86/float_dsp.asm: restore author attribution
The attribution was removed by libav while moving the code to libavutil
The original code is from
commit
eb4825b5d43bb6ecfae4d64688f9e2d2ac075263
Author: Loren Merritt <lorenm@u.washington.edu>
Date: Thu Aug 10 19:06:25 2006 +0000
sse and 3dnow implementations of float->int conversion and mdct windowing.
15% faster vorbis.
and
commit
069720565ce0f2cc94fa2474f30d155b2755e350
Author: Loren Merritt <lorenm@u.washington.edu>
Date: Fri Aug 11 18:19:37 2006 +0000
vorbis simd tweaks
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Wed, 30 May 2012 03:04:54 +0000 (04:04 +0100)]
h264: allow cropping to AVCodecContext.width/height
Override the frame size from the SPS with AVCodecContext values
if the latter specify a size smaller by less than one macroblock.
This is required for correct cropping of MOV files from Canon cameras.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Wed, 30 May 2012 03:06:00 +0000 (04:06 +0100)]
mov: set AVCodecContext.width/height for h264
This is required for correct cropping of files from Canon
cameras.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Michael Niedermayer [Sat, 9 Jun 2012 13:03:04 +0000 (15:03 +0200)]
lavc/bintext: check extradata size
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 9 Jun 2012 12:36:41 +0000 (14:36 +0200)]
lavf/bintext: allocate FF_INPUT_BUFFER_PADDING_SIZE for extradata
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 9 Jun 2012 11:59:00 +0000 (13:59 +0200)]
ffmpeg: fix fate breakage introduced by key=value buffersrc args.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Wed, 6 Jun 2012 16:31:13 +0000 (16:31 +0000)]
swscale: unscaled rgb48 <-> bgr48
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sat, 9 Jun 2012 10:57:14 +0000 (10:57 +0000)]
bink: check av_mallocz() return value
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sat, 9 Jun 2012 10:30:31 +0000 (10:30 +0000)]
binkaudio: prevent extradata overread
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Nicolas George [Wed, 23 May 2012 11:53:42 +0000 (13:53 +0200)]
ffmpeg: with filter_complex, avoid random in<->out mapping.
With complex filters, an output can come from any input,
or several inputs, including inputs of a different type.
Copying the codec parameters from the first input with
the same type does not make any sense.
This does not change anything for simple 1->1 filters,
as source_index is set in that case.
Nicolas George [Thu, 7 Jun 2012 18:49:24 +0000 (20:49 +0200)]
ffmpeg: init icodec.
With complex filter graphs, it can end up accessed
without having been set.
Nicolas George [Tue, 5 Jun 2012 10:43:33 +0000 (12:43 +0200)]
ffmpeg: use the frame rate computed by lavfi.
This frame rate is more reliable than the one copied
from the input stream, so it is used in priority.
Nicolas George [Tue, 5 Jun 2012 10:42:39 +0000 (12:42 +0200)]
ffmpeg: add frame rate to the buffersrc arguments.
The arguments now use the key=value syntax.
Nicolas George [Thu, 7 Jun 2012 18:10:10 +0000 (20:10 +0200)]
buffersrc: deprecate flat options syntax.
Nicolas George [Thu, 7 Jun 2012 18:10:36 +0000 (20:10 +0200)]
buffersrc: accept the frame rate as argument.
Nicolas George [Tue, 5 Jun 2012 10:33:35 +0000 (12:33 +0200)]
buffersrc: accept key=value arguments.
The current flat arguments syntax is not easily extensible
due to sws_param possibly containing commas.
This is also consistent with abuffersrc.
Nicolas George [Tue, 5 Jun 2012 10:40:37 +0000 (12:40 +0200)]
buffersink: add av_buffersink_get_frame_rate().
Nicolas George [Tue, 5 Jun 2012 10:32:57 +0000 (12:32 +0200)]
lavfi: add a frame_rate field to AVFilterLink.
Kostya Shishkov [Fri, 8 Jun 2012 17:34:46 +0000 (19:34 +0200)]
iac: generate codec tables as they are supposed to be
Unlike its predecessor, Indeo Audio codec generates tables depending on
sampling rate. Previously decoder used pre-generated tables for 22050 Hz
which obviously doesn't work with other frequencies.
Many thanks to Maxim Poliakovsky for providing all needed information
for this.
Kostya Shishkov [Wed, 6 Jun 2012 18:13:07 +0000 (20:13 +0200)]
indeo4: handle frame type 1 properly
It turns out that this frame type is actually intra and should be used as
a reference for interframes too.
Michael Niedermayer [Sat, 9 Jun 2012 00:50:30 +0000 (02:50 +0200)]
libavutil.v: add avpriv prefix
This should fix the fate failure
http://fate.ffmpeg.org/log.cgi?time=
20120609002213&log=compile&slot=x86_64-archlinux-gcc-enableshared
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 9 Jun 2012 00:06:58 +0000 (02:06 +0200)]
swr: skip memset(0) in rematrix when the array is known to be already 0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 9 Jun 2012 00:41:33 +0000 (02:41 +0200)]
swr: zero buffers on allocation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
J. Bohl [Fri, 8 Jun 2012 21:05:08 +0000 (23:05 +0200)]
add bracket around the argument (fixes compilation error with ICL)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 Jun 2012 22:28:16 +0000 (00:28 +0200)]
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: reset AVFrame to defaults before decoding each new frame.
ffplay: check return code of avcodec_decode_video2()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 Jun 2012 21:02:54 +0000 (23:02 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
float_dsp: ppc: add a separate header for Altivec function prototypes
ARM: fix float_dsp breakage from
d5a7229
Add a float DSP framework to libavutil
PPC: Move types_altivec.h and util_altivec.h from libavcodec to libavutil
ARM: Move asm.S from libavcodec to libavutil
vc1dsp: mark put/avg_vc1_mspel_mc() always_inline
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 Jun 2012 20:12:00 +0000 (22:12 +0200)]
swr: add mix8to2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 Jun 2012 19:56:20 +0000 (21:56 +0200)]
swr: 5.1->stereo double, float and s16
2.5 times faster than the generic code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 Jun 2012 19:55:33 +0000 (21:55 +0200)]
swr: add all in one rematrixing function ptr
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 Jun 2012 19:54:54 +0000 (21:54 +0200)]
swr: add inrermediate sample type for rematrixing
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Justin Ruggles [Fri, 8 Jun 2012 19:47:59 +0000 (15:47 -0400)]
lavu: change versioning script to include all av* prefixed symbols
Needed to properly export avpriv_* symbols.
Michael Niedermayer [Fri, 8 Jun 2012 12:41:24 +0000 (14:41 +0200)]
ffplay: reset AVFrame to defaults before decoding each new frame.
This fixes: ffplay -f lavfi -i cellauto
This was a regression since factorizing the filter code with ffmpeg.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
Michael Niedermayer [Fri, 8 Jun 2012 12:41:23 +0000 (14:41 +0200)]
ffplay: check return code of avcodec_decode_video2()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
Justin Ruggles [Fri, 8 Jun 2012 17:58:03 +0000 (13:58 -0400)]
float_dsp: ppc: add a separate header for Altivec function prototypes
Also include config.h so that HAVE_ALTIVEC will be defined.
Fixes compilation on PPC with Altivec enabled.