Michael Niedermayer
70e3cc282b
avutil/timestamp: Warn about missing __STDC_FORMAT_MACROS for C++ use
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8b02dfd37c
2014-03-15 02:42:11 +01:00
Michael Niedermayer
ff1e982205
Merge commit ' 45acc228a6' into release/2.2
...
* commit '45acc228a6
2014-03-11 12:09:13 +01:00
Michael Niedermayer
3e4b957847
Merge commit ' 0ede7b5344' into release/2.2
...
* commit '0ede7b5344
2014-03-11 11:22:10 +01:00
Michael Niedermayer
123981930f
Merge commit ' a1ab3300c8' into release/2.2
...
* commit 'a1ab3300c8
2014-03-11 10:31:47 +01:00
Lukasz Marek
3171e2360a
Revert "lavu/buffer: add release function"
...
This reverts commit 3144440004bba7b6fc41
2014-03-11 09:06:51 +01:00
Janne Grunau
45acc228a6
doc: fix a couple of typos in frame.h
...
(cherry picked from commit a18ef7a76c
2014-03-09 17:53:09 -04:00
Janne Grunau
0ede7b5344
float_dsp: fix errors in documentation
...
(cherry picked from commit 74cc901905
2014-03-08 19:36:20 -05:00
Janne Grunau
a1ab3300c8
arm: hpeldsp: prevent overreads in armv6 asm
...
Based on a patch by Russel King <rmk+libav@arm.linux.org.uk>
Bug-Id: 646
CC: libav-stable@libav.org
2014-03-05 16:21:52 +01:00
Martin Storsjö
cd6281abef
arm: Mark the stack as non-executable
...
If linking in an object file without this attribute set, the
linker will assume that an executable stack might be needed.
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 543156d751
2014-03-02 11:42:37 -05:00
Michael Niedermayer
52d928daf9
avutil/opt: allow max=min=0 for pixel formats
...
This is neccessary for maintaining ABI compatibility with FFmpeg 2.1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-01 00:31:38 +01:00
Lukasz Marek
3144440004
lavu/buffer: add release function
...
new function allows to unref buffer and obtain its data.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-25 01:38:52 +01:00
Michael Niedermayer
74bb1ca82c
avutil/frame_copy_audio: also check that channels match
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-24 10:12:33 +01:00
Michael Niedermayer
fff5262301
Merge commit ' 1155fd02ae'
...
* commit '1155fd02ae
2014-02-24 09:38:32 +01:00
James Almer
3f3d748cab
x86: Move XOP emulation to x86util
...
We need the emulation to support the cases where the first
argument is the same as the fourth. To achieve this a fifth
argument working as a temporary may be needed.
Emulation that doesn't obey the original instruction semantics
can't be in x86inc.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-24 08:30:19 +01:00
Anton Khirnov
1155fd02ae
frame: add a convenience function for copying AVFrame data
2014-02-24 07:25:07 +01:00
Michael Niedermayer
bd8d73ea8b
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
x86: add detection for Bit Manipulation Instruction sets
Conflicts:
libavutil/x86/cpu.c
See: 0bc3de19ff
2014-02-23 22:52:58 +01:00
Michael Niedermayer
d9574069c1
Merge commit ' 1b932eb150'
...
* commit '1b932eb150a2af8eddab
2014-02-23 22:43:08 +01:00
James Almer
d59fcdaff3
x86: add detection for Bit Manipulation Instruction sets
...
Based on x264 code
Signed-off-by: James Almer <jamrial@gmail.com>
2014-02-23 15:29:36 +01:00
James Almer
1b932eb150
x86: add detection for FMA3 instruction set
...
Based on x264 code
Signed-off-by: James Almer <jamrial@gmail.com>
2014-02-23 15:29:36 +01:00
James Almer
10b0161d78
x86: add missing XOP checks and macros
...
Signed-off-by: James Almer <jamrial@gmail.com>
2014-02-23 15:29:36 +01:00
Peter Ross
a3a4d07d6a
avutil/pixdesc: set bayer pixfmt descriptor flags
...
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-23 02:24:03 +01:00
James Almer
0bc3de19ff
x86: add detection for Bit Manipulation Instruction sets
...
Based on x264 code
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-22 17:26:00 +01:00
James Almer
a2af8eddab
x86: add detection for FMA3 instruction set
...
Based on x264 code
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-22 17:25:52 +01:00
Michael Niedermayer
490215cbd7
Merge commit ' 9c029f67ca'
...
* commit '9c029f67ca
2014-02-20 23:13:13 +01:00
Janne Grunau
9c029f67ca
aarch64: use EXTERN_ASM consistently for exported symbols
...
Based on e3fec3f095
2014-02-20 15:24:35 +01:00
Christophe Gisquet
996697e266
x86: float dsp: unroll SSE versions
...
vector_fmul and vector_fmac_scalar are guaranteed that they can process in
batch of 16 elements, but their SSE versions only does 8 at a time.
Therefore, unroll them a bit.
299 to 261c for 256 elements in vector_fmac_scalar on Arrandale/Win64.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
2014-02-20 14:18:05 +01:00
Michael Niedermayer
6a24d77929
Merge commit ' c3ecd968f0'
...
* commit 'c3ecd968f0
2014-02-20 02:01:13 +01:00
Michael Niedermayer
f4c8d00223
Merge commit ' 6bb8720f00'
...
* commit '6bb8720f00
2014-02-20 01:50:26 +01:00
Michael Niedermayer
0a30ad3473
Merge commit ' 874c751cc5'
...
* commit '874c751cc5
2014-02-19 21:53:58 +01:00
Anton Khirnov
c3ecd968f0
AVOptions: add flags for read/read-only options
2014-02-19 21:52:17 +01:00
Anton Khirnov
6bb8720f00
AVOptions: deprecate unused AV_OPT_FLAG_METADATA
...
It was never used since it was added and the things it was intended for
are now exported differently.
2014-02-19 21:52:17 +01:00
Diego Biurrun
874c751cc5
threads: Check w32threads dependencies at the configure stage
...
Also add warning comment about threading implementations without matching
atomics implementation to the atomics fallback implementation.
2014-02-19 15:12:37 +01:00
Michael Niedermayer
53d11f7b2d
Merge commit ' 543156d751'
...
* commit '543156d751
2014-02-19 14:07:26 +01:00
Martin Storsjö
543156d751
arm: Mark the stack as non-executable
...
If linking in an object file without this attribute set, the
linker will assume that an executable stack might be needed.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-02-19 09:57:19 +02:00
Michael Niedermayer
8f853159f6
avutil/opt: preserve fractions in set_string_number()
...
This avoids going over a double precission float, which may loose precission
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-18 21:49:56 +01:00
Michael Niedermayer
a2bc6c116d
Merge commit ' c98f3169bf'
...
* commit 'c98f3169bf
2014-02-16 02:05:29 +01:00
Tim Walker
c98f3169bf
lavu: add AV_FRAME_DATA_DOWNMIX_INFO side data type.
2014-02-15 22:24:53 +01:00
Christophe Gisquet
133b34207c
x86: float dsp: unroll SSE versions
...
vector_fmul and vector_fmac_scalar are guaranteed that they can process in
batch of 16 elements, but their SSE versions only does 8 at a time.
Therefore, unroll them a bit.
299 to 261c for 256 elements in vector_fmac_scalar on Arrandale/Win64.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-15 18:54:21 +01:00
James Almer
23a8c63452
x86inc: Extend FMA_INSTR functionality
...
Support the cases where the first and last operand of
the XOP instruction are the same.
Also add vpmacsdql emulation.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-13 22:14:24 +01:00
Michael Niedermayer
74744790a3
Merge commit ' 25a1ba814a'
...
* commit '25a1ba814a
2014-02-12 14:41:24 +01:00
Diego Biurrun
25a1ba814a
log: Have function parameter names match between .c and .h file
...
This fixes two related Doxygen warnings.
2014-02-12 12:08:02 +01:00
James Almer
6c12b1de06
x86: add missing XOP checks and macros
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-11 03:46:52 +01:00
Michael Niedermayer
a7574a36af
Merge commit ' e3fec3f095'
...
* commit 'e3fec3f095
2014-02-08 00:49:28 +01:00
Martin Storsjö
e3fec3f095
arm: Add EXTERN_ASM to the .func and .type declarations for exported symbols
...
This makes the generated assembly more internally consistent,
avoiding declaring two labels for the same function (for cases
where EXTERN_ASM is empty) and not declaring a separate unprefixed
label in other cases.
This also makes sure the .func and .type delcarations have the same
prefix. They have previously not been used on the platforms
that have prefixed symbols on arm (iOS), but gas-preprocessor
has recently started using the .func declarations for adding
.thumb_func declarations for such functions.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-02-07 15:14:06 +02:00
James Almer
a4e4948ffe
x86/cpu: add missing avx2 AVOption in av_parse_cpu_flags()
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-06 22:45:57 +01:00
Michael Niedermayer
a3be0c334e
Merge commit ' a1e1f35203'
...
* commit 'a1e1f35203
2014-02-05 23:48:41 +01:00
Janne Grunau
a1e1f35203
lavu: add missing log.h include in timer.h
2014-02-05 21:00:51 +01:00
Michael Niedermayer
6e380cc28f
Merge commit ' 9ecb858775'
...
* commit '9ecb858775
2014-02-05 03:27:13 +01:00
Michael Niedermayer
d80b9ea11d
Merge commit ' 0e830094ad'
...
* commit '0e830094ad
2014-02-05 01:30:24 +01:00
Luca Barbato
9ecb858775
doxy: Format @code blocks so they render properly
...
@code command reports verbatim everything between it and @endcode.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-02-04 22:09:47 +01:00
