OSDN Git Service
Michael Niedermayer [Wed, 11 Apr 2012 18:24:00 +0000 (20:24 +0200)]
ffmpeg: Compensate non monotonicity errors in the audio TSs.
Audio timestamps are passed through by default and when the input
doesnt contain clean timestamps this can lead to non monotonicity
errors. (rounding to a course timebase can cause this too)
Print a warning when the errors in the timestamps are large
Fixes Ticket1167 (regression since timestamps are passed through)
This is a generic workaround that is intended to handle
slightly incorrect input files. It is very possible that some
demuxers contain bugs that lead to wrong timestamps, these demuxers
should of course still be fixed even if this change happens to
hide the issue.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 Apr 2012 22:39:19 +0000 (00:39 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libxvid: remove disabled code
qdm2: make a table static const
qdm2: simplify bitstream reader setup for some subpacket types
qdm2: use get_bits_left()
build: Consistently handle conditional compilation for all optimization OBJS.
avpacket, bfi, bgmc, rawenc: K&R prettyprinting cosmetics
msrle: convert MS RLE decoding function to bytestream2.
x86inc improvements for 64-bit
Conflicts:
common.mak
libavcodec/avpacket.c
libavcodec/bfi.c
libavcodec/msrledec.c
libavcodec/qdm2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Thu, 12 Apr 2012 22:09:47 +0000 (00:09 +0200)]
lavfi/mp: remove 2xsai wrapped filter
It was ported to a native libavfilter filter.
Stefano Sabatini [Sun, 18 Mar 2012 09:59:01 +0000 (10:59 +0100)]
lavfi: port 2xsai filter from libmpcodecs
Partially based on the port by Niel van der Westhuizen
<nielkie@gmail.com>, done for GCI 2010. Same output as the original
filter and as fast.
See thread:
Subject: [FFmpeg-devel] [PATCH] Port MPlayer 2xSaI filter to libavfilter
Date: Thu, 25 Nov 2010 01:31:24 +1000
Stefano Sabatini [Wed, 11 Apr 2012 22:04:21 +0000 (00:04 +0200)]
examples/decoding_encoding: remove unused variable "size"
Remove unused variable size from video_encode_example() function.
Fix GCC warning:
decoding_encoding.c:214:22: warning: unused variable ‘size’ [-Wunused-variable]
Stefano Sabatini [Wed, 11 Apr 2012 22:02:30 +0000 (00:02 +0200)]
lavfi: install asrc_abuffer.h header
The header is part of the public API, in particular is used by
doc/examples/filtering_audio.c.
Reimar Döffinger [Wed, 11 Apr 2012 19:04:46 +0000 (21:04 +0200)]
vorbisdec: use correct channels variable.
All code should use the local variable, the
AVCodecContext might not yet have the updated value.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Tue, 10 Apr 2012 19:49:46 +0000 (21:49 +0200)]
latmenc: validate extradata size.
Fixes potential out-of-bounds writes.
This is mostly possible when muxing ALS files where from
an extradata size of about 1050 put_bits would write data
outside the buffer.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Tue, 10 Apr 2012 19:42:17 +0000 (21:42 +0200)]
latmenc: simplify using avpriv_copy_bits.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Mon, 9 Apr 2012 16:31:50 +0000 (18:31 +0200)]
latmenc: Document assumptions when copying the AAC header.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Sun, 8 Apr 2012 22:57:11 +0000 (00:57 +0200)]
latmenc: copy pce config from proper location.
For the FATE test sample used, this only avoids a warning
message.
However for other samples like al05_44.mp4 the converted
file can be played only after this fix.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Sun, 8 Apr 2012 22:10:07 +0000 (00:10 +0200)]
latmenc: fix muxing of byte-aligned DSE.
This will only work for DSEs that are first in a packet, but
that is enough to fix handling of the reference files in
fate-suite/aac (though most of them still have other issues).
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Diego Biurrun [Fri, 29 Jul 2011 10:49:23 +0000 (12:49 +0200)]
libxvid: remove disabled code
Michael Niedermayer [Thu, 12 Apr 2012 10:57:22 +0000 (12:57 +0200)]
ffmpeg: fix ticks_per_frame for the avi stream copy case
Should not make any difference, but its more correct.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 Apr 2012 10:54:54 +0000 (12:54 +0200)]
ratecontrol: Use ticks_per_frame to calculate fps.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jakub Stachowski [Wed, 11 Apr 2012 21:36:07 +0000 (23:36 +0200)]
wmalosslessdec: Reset residues to 0 if they were not decoded from bitstream.
If channel residues are have not been decoded from bitstream, they should be
initialized to 0 instead of using values from previous subframe.
This causes bursts of noise in silent parts of some files.
This patch fixes bug #1055
Reviewed-by: Benjamin Larsson <benjamin@southpole.se>
Reviewed-by: Mashiat Sarker Shakkhar <mashiat.sarker@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Wed, 11 Apr 2012 12:03:25 +0000 (13:03 +0100)]
qdm2: make a table static const
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Wed, 11 Apr 2012 12:02:43 +0000 (13:02 +0100)]
qdm2: simplify bitstream reader setup for some subpacket types
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Wed, 11 Apr 2012 10:54:31 +0000 (11:54 +0100)]
qdm2: use get_bits_left()
Signed-off-by: Mans Rullgard <mans@mansr.com>
Michael Niedermayer [Thu, 12 Apr 2012 08:34:23 +0000 (10:34 +0200)]
msmpeg4enc: fix stored fps value
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 Apr 2012 08:13:11 +0000 (10:13 +0200)]
lavf: compute_pkt_fields, limit the pts upcorrection to mpeg
The pts correction conflicts with the ogg vorbis demuxer.
Thanks-to: Justin Ruggles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Wed, 11 Apr 2012 17:26:09 +0000 (19:26 +0200)]
ffmpeg: add -benchmark_all option.
Nicolas George [Wed, 11 Apr 2012 17:26:29 +0000 (19:26 +0200)]
ffmpeg: move getutime to the start of the file.
Diego Biurrun [Tue, 27 Mar 2012 21:10:02 +0000 (23:10 +0200)]
build: Consistently handle conditional compilation for all optimization OBJS.
Diego Biurrun [Sun, 1 Apr 2012 08:47:39 +0000 (10:47 +0200)]
avpacket, bfi, bgmc, rawenc: K&R prettyprinting cosmetics
Michael Niedermayer [Wed, 11 Apr 2012 23:29:04 +0000 (01:29 +0200)]
mjpeg: fix crash with lowres and flipped images
Fixes Ticket1155
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 11 Apr 2012 22:43:53 +0000 (00:43 +0200)]
vf_lut: fix rgba map regression
Fixes Ticket1184
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Tue, 10 Apr 2012 19:36:30 +0000 (21:36 +0200)]
lavf: always call avio_flush in av_write_trailer.
Otherwise for muxers like e.g. latmenc that never call
avio_flush (and do not have a write_trailer function)
a part of the data will always be missing.
Also update references for the voc muxer, which was also
buggy before and did not write out all data.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Michael Niedermayer [Wed, 11 Apr 2012 20:50:22 +0000 (22:50 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avplay: Don't free video filters string until the end of decoding.
movenc: small refactor mov_write_packet
movenc: remove redundant check
interplayvideo: fix av_dlog parameter type mismatch
Drop some pointless #ifdefs.
Conflicts:
libavcodec/interplayvideo.c
libavcodec/libxvidff.c
libavcodec/snowenc.c
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Ronald Bultje [Sat, 31 Mar 2012 17:10:54 +0000 (17:10 +0000)]
msrle: convert MS RLE decoding function to bytestream2.
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Reimar Döffinger [Tue, 10 Apr 2012 19:11:50 +0000 (21:11 +0200)]
latmenc: error out when packet size is too large.
Previously it would just silently write out incorrect data.
This also fixes a potential integer overflow in the allocation.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Tue, 10 Apr 2012 18:59:05 +0000 (20:59 +0200)]
latmenc: Fix ALS in LATM.
"Fix" in so far as at least it will no longer overread and possibly
crash and makes somewhat sense, but no idea whether there is anything
that can play the resulting files (FFmpeg can't).
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Tue, 10 Apr 2012 19:46:56 +0000 (21:46 +0200)]
latmenc: remove unused return value.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Henrik Gramner [Wed, 4 Apr 2012 20:03:15 +0000 (20:03 +0000)]
x86inc improvements for 64-bit
Add support for all x86-64 registers
Prefer caller-saved register over callee-saved on WIN64
Support up to 15 function arguments
Also (by Ronald S. Bultje)
Fix up our asm to work with new x86inc.asm.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Reimar Döffinger [Sun, 8 Apr 2012 19:32:20 +0000 (21:32 +0200)]
latmenc: remove dead code.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Tue, 10 Apr 2012 21:13:59 +0000 (23:13 +0200)]
h261: move tables from header to .c file.
Currently they end up twice in the binary, since both
encoder and decoder include the header and thus each gets
their own copy.
This is clearly nonsense for the const tables, but shouldn't
be necessary for the RLTable either.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Michael Niedermayer [Wed, 11 Apr 2012 18:23:27 +0000 (20:23 +0200)]
ff_samples_to_time_base: support AV_NOPTS_VALUE
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Alex Converse [Wed, 11 Apr 2012 01:18:53 +0000 (18:18 -0700)]
avplay: Don't free video filters string until the end of decoding.
av_freep()ing inside configure_video_filters() leaves a dangling
reference in the calling code, and the filter string is needed again when
reconfiguring video filters for a size change.
Dale Curtis [Tue, 10 Apr 2012 18:31:03 +0000 (11:31 -0700)]
Fix memory leaks on failed ff_h264_decode_init()
During failure conditions ff_h264_decode_init() leaks memory
allocated for nal units. Found via valgrind.
Valgrind traces: http://pastebin.com/GqTqxs8T
Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 11 Apr 2012 12:56:02 +0000 (14:56 +0200)]
oggparsevorbis: Remove code messing with cur_dts.
This code caused first_dts to become corrupt and in value to be
around relative_ts.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 11 Apr 2012 12:07:58 +0000 (14:07 +0200)]
swr: add a swr_flags AVOption
Using swr_flags instead of plain flags will avoid conflicts that
arise with plain flags and multiple libs (which all have AVOption flags)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 11 Apr 2012 11:46:31 +0000 (13:46 +0200)]
ffmpeg: support changing dither parameters for swr
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 11 Apr 2012 11:46:02 +0000 (13:46 +0200)]
cmdutils: parse options for swr
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 11 Apr 2012 11:44:48 +0000 (13:44 +0200)]
swr: add a dither_scale parameter to tune the amplitude of the dither.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 11 Apr 2012 11:44:15 +0000 (13:44 +0200)]
swr: pass context to swri_get_dither()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Wed, 11 Apr 2012 10:37:14 +0000 (03:37 -0700)]
movenc: small refactor mov_write_packet
Share the formerly internal write_packet with the hinter and move the
fragment flush logic to the user facing one since it is not concerned
about movtrack-only streams.
Fixes bug #263
Signed-off-by: Martin Storsjö <martin@martin.st>
Luca Barbato [Wed, 11 Apr 2012 10:37:13 +0000 (03:37 -0700)]
movenc: remove redundant check
The proper check is already in mov_write_header.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Wed, 11 Apr 2012 11:27:22 +0000 (13:27 +0200)]
swr: add triangular highpass dither
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 11 Apr 2012 11:26:32 +0000 (13:26 +0200)]
swr: generate more dither noise to improve quality.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 11 Apr 2012 11:25:56 +0000 (13:25 +0200)]
swr: add swr_get_class()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Tue, 10 Apr 2012 16:18:40 +0000 (18:18 +0200)]
interplayvideo: fix av_dlog parameter type mismatch
libavcodec/interplayvideo.c:909:13: warning: format ‘%p’ expects argument of type ‘void *’, but argument 7 has type ‘GetByteContext’ [-Wformat]
Michael Niedermayer [Wed, 11 Apr 2012 07:57:38 +0000 (09:57 +0200)]
swr: simplify code by using av_get_bytes_per_sample()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 10 Apr 2012 21:54:04 +0000 (23:54 +0200)]
swr: fix copy & pasted comment to match the code.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 10 Apr 2012 21:34:51 +0000 (23:34 +0200)]
vda: try to fix compile
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 10 Apr 2012 20:06:53 +0000 (22:06 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master: (22 commits)
rv40dsp x86: use only one register, for both increment and loop counter
rv40dsp: implement prescaled versions for biweight.
avconv: use default channel layouts when they are unknown
avconv: parse channel layout string
nutdec: K&R formatting cosmetics
vda: Signal 4 byte NAL headers to the decoder regardless of what's in the extradata
mem: Consistently return NULL for av_malloc(0)
vf_overlay: implement poll_frame()
vf_scale: support named constants for sws flags.
lavc doxy: add all installed headers to doxy groups.
lavc doxy: add avfft to the main lavc group.
lavc doxy: add remaining avcodec.h functions to a misc doxygen group.
lavc doxy: add AVPicture functions to a doxy group.
lavc doxy: add resampling functions to a doxy group.
lavc doxy: replace \ with /
lavc doxy: add encoding functions to a doxy group.
lavc doxy: add decoding functions to a doxy group.
lavc doxy: fix formatting of AV_PKT_DATA_{PARAM_CHANGE,H263_MB_INFO}
lavc doxy: add AVPacket-related stuff to a separate doxy group.
lavc doxy: add core functions/definitions to a doxy group.
...
Conflicts:
ffmpeg.c
libavcodec/avcodec.h
libavcodec/vda.c
libavcodec/x86/rv40dsp.asm
libavfilter/vf_scale.c
libavformat/nutdec.c
libavutil/mem.c
tests/ref/acodec/pcm_s24daud
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 10 Apr 2012 19:10:14 +0000 (21:10 +0200)]
swr: add triangular dither support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 10 Apr 2012 18:30:06 +0000 (20:30 +0200)]
swr: remove unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 10 Apr 2012 18:29:47 +0000 (20:29 +0200)]
swr: add SWR_DITHER_RECTANGULAR to AVOptions array
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Mon, 9 Apr 2012 19:19:30 +0000 (21:19 +0200)]
aacsbr: silence message for SBR extension "padding".
Some files contain a few additional, all-0 bits.
Check for that case and don't print incorrect "not supported"
message.
Fixes trac issue #836.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Michael Niedermayer [Tue, 10 Apr 2012 17:53:43 +0000 (19:53 +0200)]
swr-test: include opt.h, this is needed for changing options for testing.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 10 Apr 2012 17:53:11 +0000 (19:53 +0200)]
swr: use assert in swri_sum2 to check that only supported formats are used.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 10 Apr 2012 17:52:42 +0000 (19:52 +0200)]
swr: add dither support.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 10 Apr 2012 16:56:17 +0000 (18:56 +0200)]
swr: update copyright year for rematrix
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Tue, 10 Apr 2012 12:27:59 +0000 (14:27 +0200)]
Drop some pointless #ifdefs.
The files are only compiled if the #ifdef conditions are met.
Christophe GISQUET [Tue, 20 Mar 2012 15:13:55 +0000 (16:13 +0100)]
rv40dsp x86: use only one register, for both increment and loop counter
Around 10 cycles faster for luma.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Christophe GISQUET [Mon, 19 Mar 2012 21:46:28 +0000 (22:46 +0100)]
rv40dsp: implement prescaled versions for biweight.
Quite often, the original weights are multiple of 512. By prescaling them
by 1/512 when they are computed (once per frame), no intermediate shifting
is needed, and no prescaling on each call either.
The x86 code already used that trick.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Justin Ruggles [Thu, 5 Apr 2012 22:11:28 +0000 (18:11 -0400)]
avconv: use default channel layouts when they are unknown
If either input or output layout is known and the channel counts match,
use the known layout for both. Otherwise choose the default layout based on
av_get_default_channel_layout().
Changed some FATE references due to some WAVE files now having a non-zero
channel mask.
Justin Ruggles [Thu, 5 Apr 2012 21:47:20 +0000 (17:47 -0400)]
avconv: parse channel layout string
This allows the user to use channel layout names instead of having to use the
channel mask values.
Nicolas George [Sat, 7 Apr 2012 13:09:16 +0000 (15:09 +0200)]
vf_drawtext: fontconfig support.
Nicolas George [Tue, 10 Apr 2012 07:55:30 +0000 (09:55 +0200)]
vf_drawtext: fix memory leak of draw expression.
Nicolas George [Tue, 10 Apr 2012 07:55:11 +0000 (09:55 +0200)]
vf_drawtext: fix memory leak of glyph data.
Asen Lekov [Fri, 2 Dec 2011 16:14:05 +0000 (16:14 +0000)]
nutdec: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Sebastien Zwickert [Tue, 10 Apr 2012 11:48:08 +0000 (13:48 +0200)]
vda: Signal 4 byte NAL headers to the decoder regardless of what's in the extradata
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Tue, 10 Apr 2012 11:38:10 +0000 (13:38 +0200)]
resample: support double precission resampling
This commit is dedicated to the audiophiles who can hear it when a
needle is dropped on the moon.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 10 Apr 2012 11:19:29 +0000 (13:19 +0200)]
swr: support int32 and float as internal sample formats
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 10 Apr 2012 11:18:49 +0000 (13:18 +0200)]
swr: support float & int32 in the resampler
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 10 Apr 2012 11:06:00 +0000 (13:06 +0200)]
swr-test: Add newline to test output
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 10 Apr 2012 10:35:37 +0000 (12:35 +0200)]
resample: update copyright years, they where incorrect.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Sun, 8 Apr 2012 14:38:45 +0000 (17:38 +0300)]
mem: Consistently return NULL for av_malloc(0)
Plain POSIX malloc(0) is allowed to return either NULL or a
non-NULL pointer. The calling code should be ready to handle
a NULL return as a correct return (instead of a failure) if the size
to allocate was 0 - this makes sure the condition is handled
in a consistent way across platforms.
This also avoids calling posix_memalign(&ptr, 32, 0) on OS X,
which returns an invalid pointer (a non-NULL pointer that causes
crashes when passed to av_free).
Abort in debug mode, to help track down issues related to
incorrect handling of this case.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Mon, 9 Apr 2012 20:48:20 +0000 (22:48 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: use default alignment for audio buffer
avcodec: use align == 0 for default alignment in avcodec_fill_audio_frame()
avutil: use align == 0 for default alignment in audio sample buffer functions
avutil: allow NULL linesize in av_samples_fill_arrays() and av_samples_alloc()
avconv: remove OutputStream.picref.
avconv: only set SAR once on the decoded frame.
avcodec: validate the channel layout vs. channel count for decoders
audioconvert: make av_get_channel_layout accept composite names.
avutil: add av_get_packed_sample_fmt() and av_get_planar_sample_fmt()
Conflicts:
doc/APIchanges
ffmpeg.c
libavcodec/utils.c
libavcodec/version.h
libavutil/audioconvert.c
libavutil/audioconvert.h
libavutil/avutil.h
libavutil/samplefmt.c
libavutil/samplefmt.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Mon, 9 Apr 2012 19:54:38 +0000 (21:54 +0200)]
Fix gif regression test on big-endian.
Decode output must be converted to rgb24 to avoid CRC difference
due to palette being stored in machine endianness.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Anton Khirnov [Sun, 1 Apr 2012 16:51:27 +0000 (18:51 +0200)]
vf_overlay: implement poll_frame()
Signal that it can output a frame when there are frames on the main
input and EOF on the overlay input, but a frame is buffered -- e.g.
single picture overlay.
Anton Khirnov [Mon, 9 Apr 2012 04:05:50 +0000 (06:05 +0200)]
vf_scale: support named constants for sws flags.
Anton Khirnov [Sun, 8 Apr 2012 12:08:05 +0000 (14:08 +0200)]
lavc doxy: add all installed headers to doxy groups.
Anton Khirnov [Sun, 8 Apr 2012 11:49:15 +0000 (13:49 +0200)]
lavc doxy: add avfft to the main lavc group.
Anton Khirnov [Sun, 8 Apr 2012 11:35:50 +0000 (13:35 +0200)]
lavc doxy: add remaining avcodec.h functions to a misc doxygen group.
Anton Khirnov [Sun, 8 Apr 2012 11:22:19 +0000 (13:22 +0200)]
lavc doxy: add AVPicture functions to a doxy group.
Anton Khirnov [Sun, 8 Apr 2012 11:22:19 +0000 (13:22 +0200)]
lavc doxy: add resampling functions to a doxy group.
Anton Khirnov [Sun, 8 Apr 2012 11:05:53 +0000 (13:05 +0200)]
lavc doxy: replace \ with /
It's the more proper symbol to use and it prevents doxygen from thinking
it's a command.
Anton Khirnov [Sun, 8 Apr 2012 10:45:58 +0000 (12:45 +0200)]
lavc doxy: add encoding functions to a doxy group.
Anton Khirnov [Sun, 8 Apr 2012 10:45:58 +0000 (12:45 +0200)]
lavc doxy: add decoding functions to a doxy group.
Anton Khirnov [Sun, 8 Apr 2012 10:31:56 +0000 (12:31 +0200)]
lavc doxy: fix formatting of AV_PKT_DATA_{PARAM_CHANGE,H263_MB_INFO}
Anton Khirnov [Sun, 8 Apr 2012 10:28:46 +0000 (12:28 +0200)]
lavc doxy: add AVPacket-related stuff to a separate doxy group.
Also move AV_PKT_DATA_PARAM_CHANGE/AV_PKT_DATA_H263_MB_INFO to the
proper place.
Anton Khirnov [Sun, 8 Apr 2012 10:12:33 +0000 (12:12 +0200)]
lavc doxy: add core functions/definitions to a doxy group.
Michael Niedermayer [Mon, 9 Apr 2012 18:55:09 +0000 (20:55 +0200)]
exr: optimize exr_halflt2uint()
30% faster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Mon, 2 Apr 2012 17:03:30 +0000 (19:03 +0200)]
ppc: Add/remove a number of const qualifiers to fix related warnings.
Justin Ruggles [Sun, 8 Apr 2012 19:00:01 +0000 (15:00 -0400)]
avconv: allow '-async -1' to disable timestamp sync for audio encoding
This will allow a workaround for cases where input timestamps are invalid or
when decoder delay of 1 packet or more confuses avconv into using the wrong
timestamps as a sync reference.
Reimar Döffinger [Sun, 8 Apr 2012 14:23:18 +0000 (16:23 +0200)]
Add gif and xbm regression tests.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Sun, 8 Apr 2012 13:11:13 +0000 (15:11 +0200)]
vf_scale: ensure the palette is set for output.
Since those are pseudo-palette formats, swscale does not write
into data[1], swscale must initialize the palette properly itself.
This lead to frames that actually decoded as all-gray before.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Sun, 8 Apr 2012 14:12:46 +0000 (16:12 +0200)]
Mark GRAY8 format as pseudo-paletted.
This fixes that the GIF encoder crashes with it because
it has no palette.
And the arguments for the pseudopalette apply to gray8 as
much as to RGB8 etc.
In addition the changes required in lavfi should be needed anyway
when adding support for RGB8 etc.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>