Michael Niedermayer
de7d290631
av_d2q: Fix infinity check
...
The old check would fail on huge but not infinite values
and the later code could then fail to handle them correctly in
some cases.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-25 16:03:50 +02:00
Michael Niedermayer
fe99b1d50e
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
cpu: Include common.h for av_popcount64
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-24 17:19:21 +02:00
Michael Niedermayer
87a2bf2459
avutil/bprint: Fix doxygen comments
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-24 15:36:54 +02:00
Michael Niedermayer
fe40a9f98f
Merge commit '2a6eaeaa85d17b27ee0dd449183ec197c35c9675'
...
* commit '2a6eaeaa85d17b27ee0dd449183ec197c35c9675':
Move get_logical_cpus() from lavc/pthread to lavu/cpu.
Conflicts:
doc/APIchanges
libavcodec/pthread.c
libavutil/cpu.c
libavutil/cpu.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-24 13:24:28 +02:00
Martin Storsjö
597208fde1
cpu: Include common.h for av_popcount64
...
This fixes build failures on windows since 2a6eaeaa8
.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-05-24 13:34:19 +03:00
Clément Bœsch
cf6ed1f129
lavu/opencl: remove semi-colon from macro.
...
Fixes compilation when the macros are empty and the label above ends up
containing no statement. Also makes usage of these macro consistent
(some already have a semi colon, some others don't).
Fixes Ticket #2603
2013-05-24 12:01:02 +02:00
Anton Khirnov
2a6eaeaa85
Move get_logical_cpus() from lavc/pthread to lavu/cpu.
...
It will be useful in lavfi, and could conceivably be useful to the user
applications as well.
2013-05-24 09:28:00 +02:00
Anton Khirnov
f36d7831d9
pixdesc: mark gray8 as pseudopal
...
Many functions treat it as such already.
Fixes Bug 499.
CC:libav-stable@libav.org
2013-05-22 21:18:08 +02:00
Paul B Mahol
f98dbc7311
lavu/opt: check if class is NULL too
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-21 20:50:49 +00:00
Michael Niedermayer
81bec0ace4
avutil/pixfmt: add forgotten deprecated to YUVJ411
...
Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21 21:49:28 +02:00
Michael Niedermayer
a90baa63c3
add YUVJ411P
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21 12:56:11 +02:00
Xidorn Quan
5a65fea655
avutil/frame: continue to process bufs even if some are empty
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-20 23:34:15 +02:00
Giorgio Vazzana
a67304d05f
avutil/md5: move loop inside inner function
...
AMD Athlon(tm) II X3 450 Processor
size: 1048576 runs: 1024 time: 5.660 +- 0.023
size: 1048576 runs: 1024 time: 5.661 +- 0.030
size: 1048576 runs: 1024 time: 5.656 +- 0.022
size: 1048576 runs: 1024 time: 5.647 +- 0.026
size: 1048576 runs: 1024 time: 5.428 +- 0.037
size: 1048576 runs: 1024 time: 5.426 +- 0.034
size: 1048576 runs: 1024 time: 5.426 +- 0.034
size: 1048576 runs: 1024 time: 5.428 +- 0.038
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-20 22:07:48 +02:00
Michael Niedermayer
9c49d5908d
avutil/hmac: silence pointer type warnings
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-20 14:48:55 +02:00
Giorgio Vazzana
d0a34aeedf
md5: optimize second round by using 4-operation form of G()
...
4-operation form is preferred over 3-operation because it breaks a long
dependency chain, thus allowing a superscalar processor to execute more
operations in parallel.
The idea was taken from: http://www.zorinaq.com/papers/md5-amd64.html
AMD Athlon(tm) II X3 450 Processor, x86_64
$ for i in $(seq 1 4); do ./avutil_md5_test2; done
size: 1048576 runs: 1024 time: 5.821 +- 0.019
size: 1048576 runs: 1024 time: 5.822 +- 0.019
size: 1048576 runs: 1024 time: 5.841 +- 0.018
size: 1048576 runs: 1024 time: 5.821 +- 0.018
$ for i in $(seq 1 4); do ./avutil_md5_test2; done
size: 1048576 runs: 1024 time: 5.646 +- 0.019
size: 1048576 runs: 1024 time: 5.646 +- 0.018
size: 1048576 runs: 1024 time: 5.642 +- 0.019
size: 1048576 runs: 1024 time: 5.641 +- 0.019
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-20 04:27:34 +02:00
Michael Niedermayer
97200d89b9
Merge commit '40020e171a3549a2c0b65ce6f2649aec868872f2'
...
* commit '40020e171a3549a2c0b65ce6f2649aec868872f2':
doxy: add a section about versioning.
Conflicts:
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 11:17:52 +02:00
Michael Niedermayer
0718f0cc24
Merge commit 'bc8c1cdc7bfe7b1fe56df812aabdac3de2555cec'
...
* commit 'bc8c1cdc7bfe7b1fe56df812aabdac3de2555cec':
lavfi doxy: add a page for lavfi.
jpegls: check the scan offset
Conflicts:
libavcodec/jpeglsdec.c
libavfilter/avfilter.h
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 11:04:11 +02:00
Reimar Döffinger
24c65eb29f
md5: avoid unnecessary copying.
...
Where necessary use memcpy instead.
Thanks to Giorgio Vazzana [mywing81 gmail] for
spotting this loop as the cause for the bad
performance.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-05-17 21:16:02 +02:00
Anton Khirnov
40020e171a
doxy: add a section about versioning.
2013-05-17 20:26:18 +02:00
Anton Khirnov
bc8c1cdc7b
lavfi doxy: add a page for lavfi.
2013-05-17 20:26:11 +02:00
Paul B Mahol
3a751eab78
lavu/opt: add AV_OPT_TYPE_COLOR
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-17 11:32:53 +00:00
James Almer
b22f96b736
Rename ffadler to ffhash and expand it using the generic hash API
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-16 17:58:56 +02:00
Michael Niedermayer
4390fa6273
Merge commit 'd46c588f3cb1963a00e990ceaf4ba9ffa05a716d'
...
* commit 'd46c588f3cb1963a00e990ceaf4ba9ffa05a716d':
Remove commented-out #includes
h263dec: Remove broken and disabled debug cruft
vc1: Reindent INIT_LUT(), align backslashes
Conflicts:
libavcodec/vc1.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-16 09:11:04 +02:00
James Almer
35188e91ef
lavu/hash: Fix CRC32 calculation
...
Initialize it with UINT32_MAX and xor the result with UINT32_MAX
as well.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-15 23:53:40 +02:00
James Almer
c55c715c81
lavu/hash: Fix adler32 calculation
...
Adler must be initialized with a non zero value.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-15 23:53:40 +02:00
Diego Biurrun
d46c588f3c
Remove commented-out #includes
2013-05-15 23:01:21 +02:00
Michael Niedermayer
e003413fe9
murmur3: fix memleak
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-15 12:10:09 +02:00
Michael Niedermayer
c7c71f95f8
replace remaining PIX_FMT_* flags with AV_PIX_FMT_FLAG_*
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-15 11:23:14 +02:00
Michael Niedermayer
ff4680922f
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_*
Conflicts:
doc/APIchanges
libavcodec/avpicture.c
libavcodec/ffv1dec.c
libavcodec/ffv1enc.c
libavcodec/imgconvert.c
libavcodec/tiffenc.c
libavfilter/vf_pixdesctest.c
libavfilter/vf_scale.c
libavutil/imgutils.c
libavutil/pixdesc.c
libavutil/version.h
libswscale/swscale_internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-15 11:10:09 +02:00
Michael Niedermayer
aa6454e6ca
Merge commit '096696ef0dd391d9430376d1444c1a3cde9171fd'
...
* commit '096696ef0dd391d9430376d1444c1a3cde9171fd':
avfiltergraph: simplify inserting conversion filters.
Clarify output of av_get_bits_per_pixel
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-15 10:21:16 +02:00
Anton Khirnov
e6c4ac7b5f
pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_*
2013-05-15 07:46:51 +02:00
Kieran Kunhya
ede75ebc9b
Clarify output of av_get_bits_per_pixel
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-05-15 07:45:09 +02:00
James Almer
dc7656279a
lavu/hash: Fix name of SHA224
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-14 19:43:51 +02:00
Reimar Döffinger
7d1d596817
Add a generic hash API.
...
Also use this API in framemd5.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-05-13 21:42:37 +02:00
Reimar Döffinger
86215c326e
Add 128 bit murmur3 hash function.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-05-13 21:42:37 +02:00
Clément Bœsch
b3c263e209
lavu/common: make FF_CEIL_RSHIFT faster when shift is constant.
...
See "[PATCH] lavfi/lut: use FF_CEIL_RSHIFT for chroma w/h rounding."
thread for more information.
2013-05-13 17:53:16 +02:00
Stefano Sabatini
e3984166a4
lavu/mem: add av_dynarray2_add()
...
Based on a patch by Clément Bœsch.
See thread:
From: Clément Bœsch <ubitux@gmail.com>
Subject: [FFmpeg-devel] [PATCH 1/5] lavu: add av_dynarray_alloc_elem().
Date: Sun, 14 Apr 2013 03:07:54 +0200
2013-05-13 13:52:31 +02:00
Stefano Sabatini
84be806982
lavu: define FF_MEMORY_POISON and use it
...
Allow single-place definition of constant used to fill poisoned memory.
2013-05-13 13:52:26 +02:00
Stefano Sabatini
eeb9a4928d
lavu/mem.h: fix typo
2013-05-10 10:32:59 +02:00
Clément Bœsch
570d63eef3
lavu: add FF_CEIL_RSHIFT and use it in various places.
2013-05-09 16:59:42 +02:00
Michael Niedermayer
3d66ce17b7
tools: Add adler32 checksum tool
...
This is about 6 times faster than md5sum on linux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-09 16:21:17 +02:00
Michael Niedermayer
8d9537228f
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
msvc: Move linker pragma from config.h to libavutil/internal.h
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-08 14:32:43 +02:00
Stefano Sabatini
ee9794ed20
lavu/mem: fix potential int overflow and crash in av_dynarray_add()
...
Also extend documentation accordingly.
2013-05-08 01:39:12 +02:00
Stefano Sabatini
c773adee3f
lavu/mem: extend documentation for av_dynarray_add()
...
In particular, mention the fact that the amortized element addition cost
is constant.
2013-05-08 01:39:12 +02:00
Martin Storsjö
06122c2533
msvc: Move linker pragma from config.h to libavutil/internal.h
...
This makes linking succeed for tools that include config.h but
don't link to libavutil.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-05-08 01:28:25 +03:00
Michael Niedermayer
2efbbc4644
avutil/av_pix_fmt_swap_endianness: simplify and fix code
...
This makes the code also more robust, not having a hard-coded
table that can become (and was) incomplete.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-07 13:13:09 +02:00
Michael Niedermayer
60fd88059a
Merge commit '74652af821d7e526a6541876a637fbf81261fa8e'
...
* commit '74652af821d7e526a6541876a637fbf81261fa8e':
pixdesc: add function to return pixel format with swapped endiannes
Conflicts:
libavutil/pixdesc.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-07 10:49:40 +02:00
Janne Grunau
74652af821
pixdesc: add function to return pixel format with swapped endiannes
2013-05-06 18:51:47 +02:00
highgod0401
41aa199998
lavu/opencl_internal: use av_opencl_errstr
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 12:08:04 +02:00
highgod0401
548101b553
lavu/opencl: add opencl public error API
...
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 13:44:29 +02:00
Michael Niedermayer
3c200aa693
Merge commit '1fda184a85178cfd7b98d9e308d18e1ded76a511'
...
* commit '1fda184a85178cfd7b98d9e308d18e1ded76a511':
avutil: Add av_cold attributes to init functions missing them
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 12:53:50 +02:00
Diego Biurrun
1fda184a85
avutil: Add av_cold attributes to init functions missing them
2013-05-04 22:48:05 +02:00
Paul B Mahol
e6d4e68755
lavu: add planar 16 bit and 8 bit rgb with alpha
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-03 16:58:22 +00:00
Michael Niedermayer
e91339cde2
Merge commit '566b7a20fd0cab44d344329538d314454a0bcc2f'
...
* commit '566b7a20fd0cab44d344329538d314454a0bcc2f':
x86: float dsp: butterflies_float SSE
Conflicts:
libavutil/x86/float_dsp.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 11:57:59 +02:00
Christophe Gisquet
566b7a20fd
x86: float dsp: butterflies_float SSE
...
97c -> 49c
Some codecs could benefit from more unrolling, but AAC doesn't.
2013-05-03 08:08:02 +02:00
highgod0401
6354a6ce52
lavu/opencl: fix bug of opencl options
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-02 14:42:02 +02:00
Michael Niedermayer
89b5039ff2
avutil/mem: add av_memdup()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-02 13:44:05 +02:00
Michael Niedermayer
67731ef40f
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avutil: doxy: Small clarification for av_buffer_create()
avcodec: doxy: Clarify how to use buf[] when implementing get_buffer2()
avcodec: doxy: Clarify what get_buffer2 must fill in buf[]
Conflicts:
libavutil/buffer.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 18:33:30 +02:00
Michael Niedermayer
148f69eb4e
Merge commit 'f5eecee865a731d2412fde2f73c29f8f8115c499'
...
* commit 'f5eecee865a731d2412fde2f73c29f8f8115c499':
ppc: util_altivec: Surround AltiVec-related code by appropriate ifdefs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 17:57:55 +02:00
Michael Niedermayer
7edb984dd0
avutil/log: Fix context pointer used for get_category()
...
Fixes calling a random pointer
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-30 20:06:24 +02:00
Derek Buitenhuis
af8a47905a
avutil: doxy: Small clarification for av_buffer_create()
...
Explicitly saying it can't hurt.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-04-30 13:33:43 -04:00
Diego Biurrun
f5eecee865
ppc: util_altivec: Surround AltiVec-related code by appropriate ifdefs
...
This prevents non-AltiVec-enabled compilers from choking.
2013-04-30 12:19:44 +02:00
highgod0401
df9117921a
lavu/opencl: add check version and platform
...
Reviewed-by: Hanspeter Niederstrasser <niederstrasser@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28 23:42:58 +02:00
Stefano Sabatini
1c1a2d1319
lavu/mem: remove redundant comment from av_dynarray_add()
...
The function is documented in mem.h.
2013-04-27 20:34:10 +02:00
Michael Niedermayer
a057552212
avutil/log: dont count&print repeats for empty strings
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-26 23:41:29 +02:00
Michael Niedermayer
74b1c32a80
avutil/log: leave prefix printing state on empty input.
...
Fixes printing the prefix after an empty string was printed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-26 20:31:25 +02:00
highgod0401
f31247cf47
lavu/opencl:add opencl set param function
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-26 03:04:42 +02:00
Nicolas George
29ebb7ba8d
lavu: fix GET_UTF8 macro.
...
Prevent 0xFE and 0xFF from being considered the start of
non-standard 7-bytes sequences. No noticeable effect on speed.
2013-04-24 19:41:27 +02:00
highgod0401
6d7ec4fc2e
lavu/opencl:optimize compile kernel operation
...
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-22 15:07:54 +02:00
Michael Niedermayer
63090842df
av_samples_alloc_array_and_samples: Fix sizeof type.
...
Fixes CID1005317
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-21 00:26:17 +02:00
Paul B Mahol
3e9c0217fd
lavu: add av_clipd_c
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-18 14:38:21 +00:00
Michael Niedermayer
c25224737c
avutil/intfloat_readwrite: include common.h for isinf()
...
Solution based on rational.c, which uses isinf() too
This should fix compilation with msvc
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-17 23:22:22 +02:00
Michael Niedermayer
cc6f848dba
avutil/intfloat_readwrite: avoid comparission with INFINITY, use isinf()
...
Should fix pgc warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-17 21:25:41 +02:00
Michael Niedermayer
92218aad00
butterflies_float: replace 2 lea by 2 add
...
adds are simpler instructions and should be faster or equally fast
on all cpus
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-17 00:10:06 +02:00
Christophe Gisquet
1a4007964c
x86: float dsp: butterflies_float SSE
...
97c -> 49c
Some codecs could benefit from more unrolling, but AAC doesn't.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-17 00:03:25 +02:00
Michael Niedermayer
e701cd96c2
avutil/avutil_version: Run checks just once
...
This ensures that applications that call avutil_version() often
would not run the checls every time
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-16 17:04:16 +02:00
Michael Niedermayer
2d8a3cf4c1
avutil/pixdesc: check for component overlap
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-16 15:10:13 +02:00
Michael Niedermayer
f807d6d200
avutil/pixdesc: check step/depth against each other
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-16 14:36:49 +02:00
Michael Niedermayer
20e99a9c10
avutil/pixdesc: support for self-checking the descriptors
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-16 14:27:14 +02:00
Michael Niedermayer
1314f534e5
avutil/pixdesc: fix rgb0 descriptors
...
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-16 14:27:14 +02:00
Michael Niedermayer
8a11114a79
pca: use av_calloc()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-15 20:31:06 +02:00
Michael Niedermayer
003d497d31
pca: use sizeof(variable) instead of sizeos(TYPE)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-15 20:31:06 +02:00
Clément Bœsch
28ac8426e6
lavu/dict: cosmetic realign.
2013-04-13 23:48:26 +02:00
James Almer
572e38a513
log: Remove redundant va_list creation from missing_feature_sample()
...
avpriv_request_sample() and avpriv_report_missing_feature() were printing bogus values for the extra arguments.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-13 21:14:34 +02:00
Nicolas George
9e8e03de38
lavu/opt: check int lists length for overflow.
...
Also add parens on macro arguments.
2013-04-13 20:19:24 +02:00
Nicolas George
2a1d7ea5f8
lavu: add parens to macro argument.
2013-04-13 20:19:24 +02:00
Nicolas George
76c8060654
lavu: add av_pure to av_int_list_length_for_size.
2013-04-13 20:19:24 +02:00
highgod0401
8f99494c1c
avutil/opencl: merge opencl env to opencl context
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 23:54:40 +02:00
Nicolas George
af0d270aac
lavu: add helper functions for integer lists.
...
Add av_int_list_length() to compute a list length.
Add av_opt_set_int_list() to set a binary option.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 12:09:51 +02:00
Michael Niedermayer
b2175b0f2a
Merge commit '93e65e9a6c0895f869752a66731d9b2ec3916467'
...
* commit '93e65e9a6c0895f869752a66731d9b2ec3916467':
Cosmetics, restore alphabetic order in atomics lists.
Conflicts:
libavutil/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 22:22:06 +02:00
highgod0401
9d442b9cc0
opencl: add spec opencl device APIs 20130411
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 12:46:34 +02:00
Anton Khirnov
93e65e9a6c
Cosmetics, restore alphabetic order in atomics lists.
2013-04-11 12:31:14 +02:00
highgod0401
db2de94e95
avutil/opencl: add opencl device list APIs 20130411
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 03:48:57 +02:00
Stefano Sabatini
8afcaaeb75
lavu/eval: rename "new_eval_expr()" to "make_eval_expr()"
...
The new name is more semantically and stilistically consistent.
2013-04-10 13:11:27 +02:00
Ronald S. Bultje
b93b27edb0
dsputil: Make dsputil selectable
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-04-10 11:04:05 +03:00
Christophe Gisquet
2e81acc687
x86inc: Fix number of operands for cmp* instructions
...
cmp{p,s}{s,d} instructions do take an imm8 operand.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-04-09 23:55:30 +02:00
highgod0401
99186f1fd2
fix bug of finding CPU device
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-05 20:47:21 +02:00
Christophe Gisquet
0b467a6e83
x264asm: fix cmp* number of arguments
...
cmp{p,s}{s,d} instructions do take an imm8 operand.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-05 16:42:12 +02:00
Michael Niedermayer
8e85b69d71
Merge commit '8c65264595d5a82c56ae5043320e4b875a414229'
...
* commit '8c65264595d5a82c56ae5043320e4b875a414229':
pixdesc/pixfmt: Add XYZ colorspace for XYZ 12-bit values
img2: Add j2k file extension for JPEG 2000
Conflicts:
libavutil/pixfmt.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-05 12:39:06 +02:00
Nicolas Bertrand
8c65264595
pixdesc/pixfmt: Add XYZ colorspace for XYZ 12-bit values
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-04-04 19:50:59 +02:00