Michael Niedermayer
e7e14bc69a
Merge commit ' 38c1466ca4'
...
* commit '38c1466ca4
2013-01-26 13:34:30 +01:00
Justin Ruggles
38c1466ca4
dict: add av_dict_parse_string()
...
Can be used to set multiple key/value pairs from a string.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-01-25 17:20:03 +01:00
Michael Niedermayer
25be63005f
Merge commit ' b85a5e87af'
...
* commit 'b85a5e87af
2013-01-25 14:36:45 +01:00
Michael Niedermayer
b2d0c5bd13
Merge commit ' 33552a5f7b'
...
* commit '33552a5f7b
2013-01-25 14:24:38 +01:00
Vladimir Pantelic
b85a5e87af
lavu: Add av_strnstr()
...
This is a length limited version of strstr()
Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-01-25 10:47:51 +01:00
Jason
77b740ac0a
lavu/timecode: fix time code calculation for 60000/1001 drop frame
...
Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-24 21:06:24 +01:00
Jason
a717fa84ed
lavu/timecode: Allow drop frame mode for 60000/1001 fps
...
Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-24 21:06:24 +01:00
Luca Barbato
4333df6355
avstring: K&R formatting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-01-24 20:49:54 +01:00
Stefano Sabatini
2ed0803c6c
lavu/eval: extend if/ifnot functions to accept a third parameter
...
Add support to an if/else construct, simplify logic in expressions.
2013-01-24 12:19:01 +01:00
Michael Niedermayer
9d6e0ac673
floatdsp: restrict->av_restrict
...
Fix msvc
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-24 00:49:47 +01:00
Michael Niedermayer
31cd1e20bb
eval: add function to access the current "wallclock" time.
...
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23 22:22:53 +01:00
Michael Niedermayer
8b8ac78ef3
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
rtpenc: fix overflow checking in avc_mp4_find_startcode()
rtmp: fix buffer overflows in ff_amf_tag_contents()
rtmp: fix multiple broken overflow checks
float_dsp: Include config.h for redefining restrict
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23 18:25:57 +01:00
Michael Niedermayer
8102f27b5b
Merge commit ' 73b704ac60'
...
* commit '73b704ac60
2013-01-23 14:31:55 +01:00
Michael Niedermayer
24604ebaf8
Merge commit ' 5959bfaca3'
...
* commit '5959bfaca3
2013-01-23 14:13:54 +01:00
Michael Niedermayer
6e6e170898
Merge commit ' 42d3246948'
...
* commit '42d3246948
2013-01-23 14:04:50 +01:00
Michael Niedermayer
b1b870fbd7
Merge commit ' 55aa03b9f8'
...
* commit '55aa03b9f8
2013-01-23 13:54:34 +01:00
Martin Storsjö
2e4130037c
float_dsp: Include config.h for redefining restrict
...
This makes sure that the restrict keyword is mapped to whatever
keyword the compiler prefers/supports. This fixes building on MSVC
(and possibly on GCC 2.x as well).
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-01-23 11:17:32 +02:00
Ronald S. Bultje
5959bfaca3
floatdsp: move butterflies_float from dsputil to avfloatdsp.
...
This makes wmadec/enc, twinvq and mpegaudiodec (i.e. mp2/mp3)
independent of dsputil.
2013-01-22 11:55:42 -08:00
Ronald S. Bultje
42d3246948
floatdsp: move vector_fmul_reverse from dsputil to avfloatdsp.
...
Now, nellymoserenc and aacenc no longer depends on dsputil. Independent
of this patch, wmaprodec also does not depend on dsputil, so I removed
it from there also.
2013-01-22 11:55:42 -08:00
Ronald S. Bultje
55aa03b9f8
floatdsp: move vector_fmul_add from dsputil to avfloatdsp.
2013-01-22 11:55:42 -08:00
Ronald S. Bultje
d56668bd80
floatdsp: move scalarproduct_float from dsputil to avfloatdsp.
...
This makes the aac decoder and all voice codecs independent of dsputil.
2013-01-22 11:55:42 -08:00
James Almer
e65d8509f0
libm: Add fallback definition for cbrt() using pow()
...
The function is known to be missing in at least one target (MSVC).
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-22 16:02:31 +01:00
Michael Niedermayer
ed8ff70d9e
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
x86: dsputil: Drop some unused macro definitions
x86: Add a Yasm-based emms() replacement
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-19 13:20:25 +01:00
Michael Niedermayer
b45e0c2573
Merge commit ' d633d12b2c'
...
* commit 'd633d12b2c
2013-01-19 13:11:41 +01:00
Michael Niedermayer
1b03e09198
Merge commit ' ef5d41a553'
...
* commit 'ef5d41a553
2013-01-19 13:01:06 +01:00
Martin Storsjö
f4facd2ce7
x86: Add a Yasm-based emms() replacement
...
This provides a fallback when building with Yasm enabled, but neither
inline assembly, nor the _mm_empty intrinsic are available or enabled.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-01-18 22:02:13 +01:00
Diego Biurrun
d633d12b2c
x86inc: Add cvisible macro for C functions with public prefix
...
This allows defining externally visible library symbols.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-01-18 22:02:03 +01:00
Diego Biurrun
ef5d41a553
x86inc: Rename "program_name" to "private_prefix"
...
The new name is more descriptive and will allow defining a separate
public prefix for externally visible library symbols.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-01-18 20:29:53 +01:00
Michael Niedermayer
17596198ca
Merge commit ' 80ac87c13d'
...
* commit '80ac87c13d
2013-01-18 13:36:39 +01:00
Martin Storsjö
973b4d44f1
float_dsp: Add #ifdef HAVE_INLINE_ASM around vector_fmul_window
...
This fixes builds on 64bit MSVC.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-01-17 19:07:35 +02:00
Michael Niedermayer
b7bc49a957
mips: move vector_fmul_window_mips to libavutil
...
Reviewed-by: "Babic, Nedeljko" <nbabic@mips.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-16 20:15:48 +01:00
Michael Niedermayer
5c7e9e16c9
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
lavc: Move vector_fmul_window to AVFloatDSPContext
rtpdec_mpeg4: Check the remaining amount of data before reading
Conflicts:
libavcodec/dsputil.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-16 12:38:41 +01:00
Michael Niedermayer
9ea65c65f7
Merge commit ' 0eecafc948'
...
* commit '0eecafc948
2013-01-16 12:07:27 +01:00
Michael Niedermayer
68f92a70f1
Merge commit ' dae1d507af'
...
* commit 'dae1d507af
2013-01-16 11:44:45 +01:00
Justin Ruggles
e034cc6c60
lavc: Move vector_fmul_window to AVFloatDSPContext
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-01-16 10:45:45 +01:00
Martin Storsjö
3130fa51a5
lavu: Add a fate test for the HMAC API
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-01-15 23:18:07 +02:00
Diego Biurrun
dae1d507af
x86: Add PAVGB macro to abstract pavgb/pavgusb instruction via cpuflags
2013-01-15 17:29:43 +01:00
Michael Niedermayer
b7ede94bbd
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
x86: ABSB2: port to cpuflags
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-15 16:16:18 +01:00
Michael Niedermayer
77041e2474
Merge commit ' 094a7405e5'
...
* commit '094a7405e5
2013-01-15 16:12:24 +01:00
Michael Niedermayer
e7e0186eeb
Merge commit ' ab2ad8bd56'
...
* commit 'ab2ad8bd56
2013-01-15 15:57:33 +01:00
Michael Niedermayer
cfc40a6aff
Merge commit ' d8c772de53'
...
* commit 'd8c772de53
2013-01-15 15:23:20 +01:00
Diego Biurrun
320e1d0df3
x86: ABSB2: port to cpuflags
2013-01-15 11:18:51 +01:00
Diego Biurrun
094a7405e5
x86: ABSB: port to cpuflags
2013-01-15 11:18:51 +01:00
Martin Storsjö
8ee288d258
lavu: Add an API for calculating HMAC (RFC 2104)
...
This supports HMAC-MD5 and HMAC-SHA1 for now, other hashes are
simple to add.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-01-15 11:54:19 +02:00
Diego Biurrun
51969a652c
x86: ABS2: port to cpuflags
2013-01-14 21:56:55 +01:00
Michael Niedermayer
dae382b5b2
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
Add version bump and APIchanges entry for Add AV_PIX_FMT_VDPAU.
pixfmt: add picture format for VDPAU
Conflicts:
doc/APIchanges
libavutil/pixfmt.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-12 13:42:42 +01:00
Diego Biurrun
f89466ad6f
Add version bump and APIchanges entry for Add AV_PIX_FMT_VDPAU.
...
Also fix a lavu version typo in APIchanges.
2013-01-12 12:28:12 +01:00
Rémi Denis-Courmont
169fb94f0f
pixfmt: add picture format for VDPAU
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-01-12 12:00:49 +01:00
Michael Niedermayer
ea93ccf079
Merge commit ' 5b4dfbffc2'
...
* commit '5b4dfbffc2
2013-01-07 01:35:18 +01:00
Diego Biurrun
5b4dfbffc2
x86: ABS1: port to cpuflags
2013-01-06 13:57:01 +01:00
