OSDN Git Service
Anton Khirnov [Sun, 31 Mar 2013 14:52:26 +0000 (16:52 +0200)]
af_aformat: cosmetics, fix indentation
Anton Khirnov [Sun, 31 Mar 2013 14:38:07 +0000 (16:38 +0200)]
lavfi: rename AVFilterFormats.format_count to nb_formats
This is more consistent with naming in the rest of Libav.
Anton Khirnov [Sun, 12 May 2013 12:55:54 +0000 (14:55 +0200)]
doxy: don't sort struct members alphabetically
The declaration order is more meanigful in most cases.
Anton Khirnov [Sun, 12 May 2013 12:54:43 +0000 (14:54 +0200)]
lavr doxy: add version.h to the lavr group
Anton Khirnov [Mon, 27 Feb 2012 10:34:03 +0000 (11:34 +0100)]
lavc doxy: add avcodec.h to the libavcodec group.
Anton Khirnov [Wed, 11 Apr 2012 13:45:22 +0000 (15:45 +0200)]
doxy: add a section about versioning.
Anton Khirnov [Wed, 11 Apr 2012 06:31:10 +0000 (08:31 +0200)]
lavfi doxy: add a page for lavfi.
Luca Barbato [Fri, 17 May 2013 11:08:55 +0000 (13:08 +0200)]
jpegls: check the scan offset
Prevent an out of array bound write.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Fri, 17 May 2013 10:38:44 +0000 (12:38 +0200)]
jpegls: factorize return paths
Luca Barbato [Fri, 17 May 2013 10:36:06 +0000 (12:36 +0200)]
jpegls: return meaningful errors
Michael Kostylev [Thu, 16 May 2013 13:29:46 +0000 (09:29 -0400)]
sparc: VIS mnemonics
Currently, if VIS is enabled by configure, it will also be enabled at
run-time regardless of its support in the hardware. Thus, masking VIS
usage as it is done in vis.h by constructing binary instructions is
pointless. Using normal VIS mnemonics in inline assembly allows to take
advantage of automatic register allocation, gets rid of register
variables, which are unsupported by suncc for SPARC, and improves code
readability.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Jindrich Makovicka [Thu, 16 May 2013 14:49:28 +0000 (16:49 +0200)]
mpegvideo: allocate sufficiently large scratch buffer for interlaced vid
MPV_decode_mb_internal needs 3 * 16 * linesize bytes of scratch buffer
For interlaced content, linesize is multiplied by two after the allocation
of the scratch buffer, and the dest_cr pointer ends past the buffer.
This patch makes ff_mpv_frame_size_alloc allocate a total of
(aligned line_size) * 2 * 16 * 3 bytes, which suffices even for the
interlaced case.
CC:libav-stable@libav.org
Signed-off-by: Jindrich Makovicka <makovick@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Sat, 11 May 2013 15:32:52 +0000 (17:32 +0200)]
pthread: reindent
Anton Khirnov [Sat, 11 May 2013 15:30:53 +0000 (17:30 +0200)]
lavc/pthread: remove obsolete checks
Those were useful when avcodec_thread_init() was a public functions. It
was deprecated and removed some time ago, so those checks are not needed
anymore.
Anton Khirnov [Mon, 18 Mar 2013 20:31:54 +0000 (21:31 +0100)]
vf_pixdesctest: make config_props work properly when called multiple times.
Anton Khirnov [Mon, 18 Mar 2013 20:31:54 +0000 (21:31 +0100)]
vf_hqdn3d: make config_props work properly when called multiple times.
Do not leak all the temp buffers.
Anton Khirnov [Mon, 18 Mar 2013 21:13:35 +0000 (22:13 +0100)]
vf_drawtext: don't leak the expressions.
Anton Khirnov [Mon, 18 Mar 2013 20:31:54 +0000 (21:31 +0100)]
vf_crop: make config_props work properly when called multiple times.
Do not leak the x/y expressions.
Anton Khirnov [Mon, 18 Mar 2013 20:31:54 +0000 (21:31 +0100)]
vf_setdar: make config_props work properly when called multiple times.
Do not overwrite the variable set through AVOptions.
Anton Khirnov [Mon, 18 Mar 2013 20:31:54 +0000 (21:31 +0100)]
vf_drawbox: make config_props work properly when called multiple times.
Do not overwrite the variables set through AVOptions.
Anton Khirnov [Mon, 18 Mar 2013 21:07:10 +0000 (22:07 +0100)]
vf_drawtext: do not reset the frame number in config_input.
Frame number should be incremented normally even if the link properties
change.
Anton Khirnov [Mon, 18 Mar 2013 21:32:39 +0000 (22:32 +0100)]
vf_fps: move initializing pts from config_props to init.
It should not be reinitialized if the link properties change.
Anton Khirnov [Mon, 18 Mar 2013 20:31:54 +0000 (21:31 +0100)]
vf_frei0r: make config_props work properly when called multiple times.
Do not leak the initialized filter instance.
Anton Khirnov [Mon, 18 Mar 2013 20:31:54 +0000 (21:31 +0100)]
vf_gradfun: make config_props work properly when called multiple times.
Anton Khirnov [Mon, 18 Mar 2013 20:31:54 +0000 (21:31 +0100)]
vf_lut: make config_props work properly when called multiple times.
Do not leak the expressions.
Kostya Shishkov [Thu, 16 May 2013 05:21:08 +0000 (07:21 +0200)]
Apple Intermediate Codec decoder
Jeremy Hinegardner [Sun, 24 Mar 2013 05:15:31 +0000 (23:15 -0600)]
movenc: Don't add base_data_offset in tfhd for PIFF files
According to the PIFF specification[1] the base_data_offset field MUST be
omitteed. See section 5.2.17. Since the ISMV files created by libavformat
state that they are 'piff' compatible via 'ftyp' box, this needs to be
corrected.
[1] http://www.iis.net/learn/media/smooth-streaming/protected-interoperable-file-format
Signed-off-by: Martin Storsjö <martin@martin.st>
Sebastian Sandberg [Thu, 31 Jan 2013 17:04:22 +0000 (18:04 +0100)]
vc1dec: Add support for interlaced B-frames
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Kostylev [Wed, 15 May 2013 00:25:30 +0000 (20:25 -0400)]
sparc: Eliminate dead code in VIS acceleration macros
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Luca Barbato [Wed, 15 May 2013 16:16:18 +0000 (18:16 +0200)]
flacdec: drop unnecessary assert
The condition cannot happen anymore.
Luca Barbato [Tue, 14 May 2013 13:27:26 +0000 (15:27 +0200)]
mjpegdec: properly report unsupported disabled features
When JPEG-LS support is disabled the decoder would feed the
data to the JPEG Lossless decode_*_scan function resulting in
faulty decoding.
CC: libav-stable@libav.org
Anton Khirnov [Mon, 18 Mar 2013 19:44:36 +0000 (20:44 +0100)]
vf_pad: use the name 's' for the pointer to the private context
This is shorter and consistent across filters.
Anton Khirnov [Mon, 18 Mar 2013 19:44:36 +0000 (20:44 +0100)]
vf_overlay: use the name 's' for the pointer to the private context
This is shorter and consistent across filters.
Anton Khirnov [Mon, 18 Mar 2013 19:44:36 +0000 (20:44 +0100)]
vf_lut: use the name 's' for the pointer to the private context
This is shorter and consistent across filters.
Anton Khirnov [Mon, 18 Mar 2013 19:44:36 +0000 (20:44 +0100)]
vf_libopencv: use the name 's' for the pointer to the private context
This is shorter and consistent across filters.
Anton Khirnov [Mon, 18 Mar 2013 19:44:36 +0000 (20:44 +0100)]
vf_hqdn3d: use the name 's' for the pointer to the private context
This is shorter and consistent across filters.
Anton Khirnov [Mon, 18 Mar 2013 19:44:36 +0000 (20:44 +0100)]
vf_hflip: use the name 's' for the pointer to the private context
This is shorter and consistent across filters.
Anton Khirnov [Mon, 18 Mar 2013 19:44:36 +0000 (20:44 +0100)]
vf_gradfun: use the name 's' for the pointer to the private context
This is shorter and consistent across filters.
Anton Khirnov [Mon, 18 Mar 2013 19:44:36 +0000 (20:44 +0100)]
vf_frei0r: use the name 's' for the pointer to the private context
This is shorter and consistent across filters.
Anton Khirnov [Mon, 18 Mar 2013 19:44:36 +0000 (20:44 +0100)]
vf_format: use the name 's' for the pointer to the private context
This is shorter and consistent across filters.
Anton Khirnov [Mon, 18 Mar 2013 19:44:36 +0000 (20:44 +0100)]
vf_fieldorder: use the name 's' for the pointer to the private context
This is shorter and consistent across filters.
Anton Khirnov [Mon, 18 Mar 2013 21:26:49 +0000 (22:26 +0100)]
vf_fieldorder: cosmetics, remove an extra linebreak
Anton Khirnov [Mon, 18 Mar 2013 19:44:36 +0000 (20:44 +0100)]
vf_fade: use the name 's' for the pointer to the private context
This is shorter and consistent across filters.
Anton Khirnov [Mon, 18 Mar 2013 19:44:36 +0000 (20:44 +0100)]
vf_drawtext: use the name 's' for the pointer to the private context
This is shorter and consistent across filters.
Anton Khirnov [Mon, 18 Mar 2013 19:44:36 +0000 (20:44 +0100)]
vf_drawbox: use the name 's' for the pointer to the private context
This is shorter and consistent across filters.
Anton Khirnov [Mon, 18 Mar 2013 19:44:36 +0000 (20:44 +0100)]
vf_delogo: use the name 's' for the pointer to the private context
This is shorter and consistent across filters.
Anton Khirnov [Mon, 18 Mar 2013 19:44:36 +0000 (20:44 +0100)]
vf_cropdetect: use the name 's' for the pointer to the private context
This is shorter and consistent across filters.
Anton Khirnov [Mon, 18 Mar 2013 20:48:18 +0000 (21:48 +0100)]
vf_crop: cosmetics, break lines
Anton Khirnov [Mon, 18 Mar 2013 19:44:36 +0000 (20:44 +0100)]
vf_crop: use the name 's' for the pointer to the private context
This is shorter and consistent across filters.
Anton Khirnov [Mon, 18 Mar 2013 19:44:36 +0000 (20:44 +0100)]
vf_boxblur: use the name 's' for the pointer to the private context
This is shorter and consistent across filters.
Anton Khirnov [Mon, 18 Mar 2013 19:44:36 +0000 (20:44 +0100)]
vf_blackframe: use the name 's' for the pointer to the private context
This is shorter and consistent across filters.
Anton Khirnov [Mon, 18 Mar 2013 19:44:36 +0000 (20:44 +0100)]
vf_aspect: use the name 's' for the pointer to the private context
This is shorter and consistent across filters.
Diego Biurrun [Wed, 15 May 2013 13:16:12 +0000 (15:16 +0200)]
Remove commented-out debug #define cruft
Luca Barbato [Wed, 15 May 2013 17:03:53 +0000 (19:03 +0200)]
jpegls: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diego Biurrun [Wed, 15 May 2013 17:55:09 +0000 (19:55 +0200)]
jpegls: cosmetics: Drop some unnecessary parentheses
Diego Biurrun [Wed, 15 May 2013 13:17:08 +0000 (15:17 +0200)]
mpegvideo: Remove commented-out PARANOID debug cruft
Diego Biurrun [Wed, 15 May 2013 13:09:20 +0000 (15:09 +0200)]
Remove commented-out #includes
Diego Biurrun [Wed, 15 May 2013 12:49:31 +0000 (14:49 +0200)]
h263dec: Remove broken and disabled debug cruft
Martin Storsjö [Wed, 15 May 2013 08:56:04 +0000 (11:56 +0300)]
vc1: Reindent INIT_LUT(), align backslashes
Signed-off-by: Martin Storsjö <martin@martin.st>
Alex Smith [Tue, 14 May 2013 14:05:52 +0000 (10:05 -0400)]
configure: Use linker hardening flags on mingw
This makes it consistent with the msvc builds which automatically set
the DEP and ASLR flags by default. There really is no good reason why
they shouldn't be set.
The fact that binutils does not set them on by default boggles the mind.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Wed, 24 Apr 2013 13:33:11 +0000 (15:33 +0200)]
vc1: Make INIT_LUT() self contained
Move the local variables it uses into the macro, enclosing them
in a do {} while (0) scope.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Wed, 24 Apr 2013 10:51:28 +0000 (12:51 +0200)]
vc1: Simplify code by using INIT_LUT()
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Wed, 24 Apr 2013 10:51:28 +0000 (12:51 +0200)]
vc1: Move INIT_LUT() further up to allow using it in more places
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 15 May 2013 07:32:49 +0000 (10:32 +0300)]
vc1dec: Remove some now unused variables
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Thu, 15 Nov 2012 23:48:15 +0000 (00:48 +0100)]
vc1dec: Do not allow field_mode to change after the first header
This fixes out of array accesses.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 15 May 2013 08:51:03 +0000 (11:51 +0300)]
vc1, mss2: Check for any negative return value from ff_vc1_parse_frame_header
This is required if we return other error codes than explicitly
-1, which so far has been the only other possible return value
besides 0.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Wed, 24 Apr 2013 13:01:08 +0000 (15:01 +0200)]
vc1dec: Fix current ptr selection in vc1_mc_4mv_chroma()
No sample tried shows a difference.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Wed, 24 Apr 2013 12:59:49 +0000 (14:59 +0200)]
vc1dec: Factorize picture pointer selection in vc1_mc_4mv_chroma()
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Wed, 24 Apr 2013 12:49:31 +0000 (14:49 +0200)]
vc1dec: Factorize picture pointer selection code
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Mon, 12 Nov 2012 00:34:44 +0000 (01:34 +0100)]
vc1dec: Factorize srcU/V offseting
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Sat, 20 Apr 2013 00:15:13 +0000 (02:15 +0200)]
vc1dec: Fix tff == 0 handling in init_block_index()
This fixes several files from VLC ticket 5887.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Fri, 1 Feb 2013 18:58:26 +0000 (19:58 +0100)]
vc1dec: Update destination pointers in context for fields
This replaces a large number of checks for the second field by
fixing the pointers when they are setup.
This should also fix I/BI field pictures.
Changes checksums for vc1_sa10143, the file becomes slightly closer
to what the reference decoder outputs.
Based on "vc1dec: the second field is written wrong to the picture"
by Sebastian Sandberg <sebastiand.sandberg@gmail.com>.
Signed-off-by: Martin Storsjö <martin@martin.st>
Anton Khirnov [Sun, 12 May 2013 13:41:49 +0000 (15:41 +0200)]
pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_*
Anton Khirnov [Sun, 12 May 2013 13:38:17 +0000 (15:38 +0200)]
jpeg2000dec: don't use deprecated PIX_FMT values
Anton Khirnov [Tue, 14 May 2013 06:14:21 +0000 (08:14 +0200)]
lavfi: fix compatibility code for old vf_scale options syntax
Currently it would incorrectly trigger on a string that contains a '='
but does not contain a ':', e.g. flags=<flags>.
Anton Khirnov [Tue, 14 May 2013 06:16:37 +0000 (08:16 +0200)]
avfiltergraph: simplify inserting conversion filters.
There is now no need to explicitly pass 0:0 as width/height to scale,
those are the defaults.
Kieran Kunhya [Tue, 14 May 2013 19:23:40 +0000 (14:23 -0500)]
Clarify output of av_get_bits_per_pixel
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Luca Barbato [Tue, 14 May 2013 16:03:43 +0000 (18:03 +0200)]
fate: update the mmf reference
Using Optional Data chunk introduced changes the hash.
Yoshihisa Uchida [Sat, 5 Jan 2013 22:11:09 +0000 (23:11 +0100)]
mmf: Write metadata into an Optional Data chunk
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Diego Biurrun [Mon, 13 May 2013 19:40:53 +0000 (21:40 +0200)]
jpeg2000dec: Use correct printf length modifier for pointer differences
Also eliminate an unnecessary cast. Fixes the following warning:
jpeg2000dec.c:1200:20: warning: format ‘%lX’ expects argument of type ‘long unsigned int’, but argument 5 has type ‘long long unsigned int’
Martin Storsjö [Tue, 14 May 2013 11:36:00 +0000 (14:36 +0300)]
vc1dec: Don't apply the loop filter on fields
Fixes read of uninitialized memory.
Based on a patch by Michael Niedermayer.
Signed-off-by: Martin Storsjö <martin@martin.st>
Hendrik Leppkes [Mon, 23 Jan 2012 21:17:46 +0000 (22:17 +0100)]
vc1: implement frame interlaced b-frame header parsing
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Tue, 24 Jul 2012 02:05:18 +0000 (04:05 +0200)]
vc1dec: Don't attempt error concealment on field pictures
This is not implemented and doesn't work.
Signed-off-by: Martin Storsjö <martin@martin.st>
Sebastian Sandberg [Thu, 31 Jan 2013 17:04:21 +0000 (18:04 +0100)]
vc1dec: fieldtx is only valid for interlaced frame pictures
The fieldtx_plane is not cleared for interlaced fields.
Signed-off-by: Martin Storsjö <martin@martin.st>
Claudio Freire [Sun, 12 May 2013 07:38:40 +0000 (09:38 +0200)]
aacenc: Fix erasure of surround channels
This was due to a miscomputation of s->cur_channel, which led to
psy-based encoders using the psy coefficients for the wrong channel.
Signed-off-by: Martin Storsjö <martin@martin.st>
Claudio Freire [Sat, 4 May 2013 21:36:37 +0000 (18:36 -0300)]
aacenc: Fix target bitrate for twoloop quantiser search
This fixes a case where multichannel bitrate isn't accurately
targetted by psy model alone, never achieving the target bitrate.
Signed-off-by: Martin Storsjö <martin@martin.st>
Claudio Freire [Sat, 4 May 2013 21:35:49 +0000 (18:35 -0300)]
aacenc: Fix a rounding bug in aacpsy channel bitrate computation
Signed-off-by: Martin Storsjö <martin@martin.st>
James Darnley [Fri, 15 Mar 2013 15:37:33 +0000 (16:37 +0100)]
yadif: correct strides in filter_edges_16bit
The C code treats the data as arrays of uint16_t so strides must not
be in bytes but in pixels.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
James Darnley [Sun, 10 Mar 2013 14:08:50 +0000 (15:08 +0100)]
yadif: restore speed of the C filtering code
Always use the special filter for the first and last 3 columns (only).
Changes made in
64ed397 slowed the filter to just under 3/4 of what it
was. This commit restores the speed while maintaining identical output.
For reference, on my Athlon64:
1733222 decicycles in old
2358563 decicycles in new
1727558 decicycles in this
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Matt Wolenetz [Tue, 14 May 2013 02:29:26 +0000 (19:29 -0700)]
lavc: Fix msvc compilation of utils.c with -WX (warnings treated as errors)
This fixes https://bugzilla.libav.org/show_bug.cgi?id=514.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Mon, 13 May 2013 09:06:40 +0000 (12:06 +0300)]
configure: Disable PIC for cygwin just as for win32/mingw
If this is explicitly disabled for win32/mingw, it should also
be disabled for cygwin, for consistency and for the same reasons
as for win32/mingw.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diego Biurrun [Tue, 7 May 2013 23:52:57 +0000 (01:52 +0200)]
x86: dsputil: Rename dsputil_mmx.h --> dsputil_x86.h
The header is not (anymore) MMX-specific.
Diego Biurrun [Tue, 7 May 2013 23:45:39 +0000 (01:45 +0200)]
x86: dsputil: Split inline assembly from init code
Also remove some pointless comments.
Diego Biurrun [Sat, 20 Apr 2013 18:28:28 +0000 (20:28 +0200)]
x86: dsputil: Refactor pixels16 wrapper functions with a macro
Diego Biurrun [Fri, 26 Apr 2013 14:49:03 +0000 (16:49 +0200)]
configure: x86: Only enable cpunop on i686
The assembler may insert nopl instructions for cpunop, which are not
(universally) supported on i586 CPUs.
Diego Biurrun [Fri, 26 Apr 2013 14:49:02 +0000 (16:49 +0200)]
configure: Rename cmov processor capability to i686
The goal is to make the capapility slightly more general and have it
cover the availability of the nopl instruction in addition to cmov.
Martin Storsjö [Tue, 7 May 2013 16:25:03 +0000 (19:25 +0300)]
configure: Explicitly disable PIC when targeting win32/mingw
These platforms do not have any notion of PIC. On some compilers,
enabling pic produces a number of warnings.
This avoids trying to produce PIC loads in the ARM assembly - there
are no relocation types in PE/COFF that correspond to
BFD_RELOC_32_PCREL (R_ARM_REL32 in ELF).
As a side-effect, this avoids enabling PIC on mingw64, getting rid
of the warnings about PIC not having any effect on that platform.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 9 May 2013 12:39:25 +0000 (15:39 +0300)]
configure: Use enable_weak when enabling pic
This allows it to be overridden, either by the user on the command
line, or by other sections of the configure script.
Signed-off-by: Martin Storsjö <martin@martin.st>
Janne Grunau [Thu, 9 May 2013 12:53:03 +0000 (14:53 +0200)]
indeo3: avoid writes without necessary alignment in copy_cell()
Cells starting at a position aligned to 8 pixels but wider than
4 blocks are copied with 3 blocks per loop. This creates problems on the
next loop iterations since the routine copying 2 blocks requires the
same alignment on some architectures like ARM NEON.
Christophe Gisquet [Sun, 25 Nov 2012 08:10:36 +0000 (09:10 +0100)]
x86: sbrdsp: implement SSE2 qmf_pre_shuffle
From 253 to 51 cycles on Arrandale and Win64.
44 cycles on SandyBridge.
Signed-off-by: Anton Khirnov <anton@khirnov.net>