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
highgod0401
cfaffb1ab7
avutil/opencl: replace assert by check and error message in av_opencl_init()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-04 19:27:45 +02:00
highgod0401
322428c851
avutil/opencl: check strtol for failure
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-04 19:26:16 +02:00
highgod0401
39406ea321
avutil/opencl: add check for the program number to create kernel
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-04 19:25:22 +02:00
Michael Niedermayer
e7389ed5d0
Merge commit 'bcc94328980e6c56546792ab08b0756abdce310b'
...
* commit 'bcc94328980e6c56546792ab08b0756abdce310b':
opt: check the return values of av_get_token for ENOMEM.
doc: Fix best_nb_channells typo
matroska: pass the lace size to the matroska_parse_rm_audio
Conflicts:
libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-04 13:00:59 +02:00
Anton Khirnov
bcc9432898
opt: check the return values of av_get_token for ENOMEM.
2013-04-04 07:51:53 +02:00
Carl Eugen Hoyos
c484b3af15
Fix make checkheaders without opencl headers.
2013-04-03 15:28:29 +02:00
Michael Niedermayer
6ce1d87355
Merge commit 'f9f6402e9c9ce3642df981b48507df3a2d956f65'
...
* commit 'f9f6402e9c9ce3642df981b48507df3a2d956f65':
configure: prettify atomics handling.
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-03 14:46:48 +02:00
Anton Khirnov
f9f6402e9c
configure: prettify atomics handling.
...
Add simpler names and a shorthand for native atomics (as opposed to
pthreads fallback).
2013-04-03 09:22:31 +02:00
Stefano Sabatini
064acc9743
lavu/opencl: use consistent inclusion header guard name
2013-04-01 23:54:29 +02:00
Stefano Sabatini
57d77b3963
lavu/opencl: apply misc cosmetics fixes
...
Split long lines, reindent code, add missing spaces between operators,
remove possibly confusing comment from av_opencl_buffer_read_image()
doxy, and use designated initializers for openclutils_class.
2013-04-01 23:54:21 +02:00
Michael Niedermayer
599866f5d5
Merge remote-tracking branch 'cigaes/master'
...
* cigaes/master:
lavfi/af_asetnsamples: fix EOF handling.
lavu/opt: make sure av_opt_set_bin() handles NULL/0.
lavd/v4l2: fully init an ioctl argument.
lavfi: detect merge failure for unknown layouts.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-01 15:13:07 +02:00
Michael Niedermayer
76071322a3
opencl: fix double ;
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-01 13:01:17 +02:00
highgod0401
189cbc1a03
opencl wrapper based on comments on 20130401
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-01 12:52:13 +02:00
Nicolas George
983d04dd40
lavu/opt: make sure av_opt_set_bin() handles NULL/0.
2013-04-01 10:38:38 +02:00
Clément Bœsch
d00dcb8c9f
opt: attempt to improve options dump output.
...
Add some indent and remove the '-' prefix for filters.
2013-03-31 18:22:23 +02:00
Stefano Sabatini
5c73645d91
lavu/samplefmt: add av_samples_alloc_array_and_pointers()
2013-03-31 18:00:44 +02:00
Michael Niedermayer
dc92464aee
avutil: add av_buffer_get_ref_count()
...
This function is quite usefull for debuging
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-30 20:28:00 +01:00
Xidorn Quan
c81d2fa96d
avutil/buffer: add get_opaque
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-29 17:31:16 +01:00
Michael Niedermayer
fd37a7dc3c
Merge commit 'cf53704c55378cc0dcfc16637cdac7d58f0b3107'
...
* commit 'cf53704c55378cc0dcfc16637cdac7d58f0b3107':
AVOptions: make av_set_options_string() forward options to child objects
win32: Use 64-bit fstat/lseek variants for MSVC as well
win32: Make ff_win32_open more robust
Conflicts:
libavformat/os_support.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-28 12:26:36 +01:00
Michael Niedermayer
63a97d5674
Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa'
...
* commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa':
cosmetics: Remove unnecessary extern keywords from function declarations
Conflicts:
libswscale/x86/swscale.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-28 11:20:41 +01:00
Anton Khirnov
cf53704c55
AVOptions: make av_set_options_string() forward options to child objects
2013-03-28 07:55:38 +01:00
Diego Biurrun
b6649ab503
cosmetics: Remove unnecessary extern keywords from function declarations
2013-03-27 14:21:45 +01:00
Michael Niedermayer
8e944891ce
avutil/buffer: remove redundant memory poisoning
...
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-24 02:21:42 +01:00
Michael Niedermayer
058c002932
avutil/buffer: support memory poisoning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-24 01:44:48 +01:00
Michael Bradshaw
2a97c5915b
Make audio FIFO read/write contracts more strict
...
Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-23 13:33:45 +01:00
Michael Niedermayer
6efe61486d
Merge commit '1e8b9738fa70e20967ddb542d2f9d5552fc51ec6'
...
* commit '1e8b9738fa70e20967ddb542d2f9d5552fc51ec6':
avutil/frame: add all remaining frame properties to av_frame_copy_props
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-23 12:08:01 +01:00
Hendrik Leppkes
1e8b9738fa
avutil/frame: add all remaining frame properties to av_frame_copy_props
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-03-22 20:05:37 +01:00
Clément Bœsch
77f60f0011
lavu/eval: add between() function.
2013-03-22 09:20:45 +01:00
Nicolas George
8d928a9d99
lavu/opt: add AV_OPT_TYPE_DURATION.
2013-03-20 21:04:28 +01:00
Michael Niedermayer
9ea6c14820
Merge remote-tracking branch 'cigaes/master'
...
* cigaes/master:
lavu/frame: use channels rather than channel_layout.
lavf: avformat_seek_file(): validate stream_index.
lavf/concatdec: fix possible leak in case of malloc failure.
lavfi/buffersink: check av_frame_ref() failure.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-20 13:58:04 +01:00
Michael Niedermayer
b274703493
avutil/atomic: use av_assert0()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-20 13:45:30 +01:00
Michael Niedermayer
eaa5882e71
avutil: fix compilation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-20 13:45:30 +01:00
Nicolas George
a964d6a8a2
lavu/frame: use channels rather than channel_layout.
2013-03-20 13:35:24 +01:00
Paul B Mahol
7aa9af51db
lavu/opt: add AV_OPT_VIDEO_RATE option
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-03-20 12:29:54 +00:00
Michael Niedermayer
17ebef2fc8
Merge commit '2c328a907978b61949fd20f7c991803174337855'
...
* commit '2c328a907978b61949fd20f7c991803174337855':
pixdesc: add a function for counting planes in a pixel format.
avplay: remove the -debug option.
Revert "asfenc: return error on negative timestamp"
Conflicts:
doc/APIchanges
doc/ffplay.texi
ffplay.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-20 11:24:11 +01:00
Michael Niedermayer
f1c3d8b344
avutil/add_to_pool: remove unused assgnment
...
Fixed CID991859
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-19 13:35:10 +01:00
Anton Khirnov
2c328a9079
pixdesc: add a function for counting planes in a pixel format.
2013-03-19 11:12:17 +01:00
Michael Niedermayer
6128d33946
AVFrame.pkt_dts: improve docs
...
Related to Ticket2375
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-19 00:47:00 +01:00
Michael Niedermayer
cea3a63ba3
avutil/buffer: Fix race in pool.
...
This race will always happen sooner or later in a multi-threaded
environment and it will over time lead to OOM.
This fix works by spinning, there are other ways by which this
can be fixed, like simply detecting the issue after it happened
and freeing the over-allocated memory or simply using a mutex.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-18 19:19:22 +01:00
Clément Bœsch
6abb554fd6
lavc,lavu: fix two doxy mixup between h/v chroma shift.
2013-03-18 09:04:11 +01:00
Michael Niedermayer
fbd3ee91a5
avutil/frame: typo
...
found by ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-18 04:47:27 +01:00
Michael Niedermayer
3dc25c3ab2
avutil/frame: document alignment and padding requirements
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-18 04:13:21 +01:00
Michael Niedermayer
c603f22683
avutil/get_pool: remove dead operations whichs result is never used.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-17 18:40:15 +01:00
Michael Niedermayer
e3be7b1159
avutil/get_pool: Remove redundant initial atomic operation
...
602->442 dezicycles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-17 18:40:15 +01:00
Michael Niedermayer
f566ac48ce
avutil/frame: fix video buffer allocation
...
The padding was lost during porting from avcodec
Should fix out of array accesses
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-17 02:19:25 +01:00
Stefano Sabatini
b2098d2417
lavu/eval: add bitor and bitand functions
...
Warning note suggested by Reimar.
2013-03-17 00:22:47 +01:00
Michael Niedermayer
7fff5781b6
Merge commit 'e4a7b2177d14678ae240edcabaacfe2b14619b7b'
...
* commit 'e4a7b2177d14678ae240edcabaacfe2b14619b7b':
vf_showinfo: remove its useless init function
AVOptions: fix using named constants with child contexts.
Conflicts:
libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-16 16:38:11 +01:00
Michael Niedermayer
aef816f957
Merge commit 'ca6c3f2c53be70aa3c38e8f1292809db89ea1ba6'
...
* commit 'ca6c3f2c53be70aa3c38e8f1292809db89ea1ba6':
lzo: fix overflow checking in copy_backptr()
flacdec: simplify bounds checking in flac_probe()
atrac3: avoid oversized shifting in decode_bytes()
Conflicts:
libavformat/flacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-16 14:10:09 +01:00
Anton Khirnov
4d67ff8e8e
AVOptions: fix using named constants with child contexts.
...
The named constant needs to be searched for in the same object on which
the option is set, i.e. target_obj.
2013-03-16 05:35:33 +01:00
Anton Khirnov
9676b9a2cd
AVOption: remove an unused function parameter.
2013-03-16 05:35:20 +01:00
Xi Wang
ca6c3f2c53
lzo: fix overflow checking in copy_backptr()
...
The check `src > dst' in the form `&c->out[-back] > c->out' invokes
pointer overflow, which is undefined behavior in C.
Remove the check. Also replace `&c->out[-back] < c->out_start' with
a safe form `c->out - c->out_start < back' to avoid overflow.
CC: libav-stable@libav.org
Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-03-15 12:52:31 +01:00
Michael Niedermayer
caff888183
avutil/frame: add AVBufferRef for qp table
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-15 03:02:27 +01:00
Michael Niedermayer
905e7eb413
Merge commit 'f099d3d1d5466bd63f4ab36270d169ff9ea613b8'
...
* commit 'f099d3d1d5466bd63f4ab36270d169ff9ea613b8':
Add av_log_{ask_for_sample|missing_feature} replacements to libavutil
ismindex: Check the return value of allocations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-14 12:15:02 +01:00
Diego Biurrun
f099d3d1d5
Add av_log_{ask_for_sample|missing_feature} replacements to libavutil
...
This allows reporting missing features and requesting samples from
all libraries in a standard way; with a simplified API.
2013-03-13 20:42:06 +01:00
Hendrik Leppkes
febd78e904
lavu/frame: free frame metadata when unrefing a frame.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 20:16:49 +01:00
Hendrik Leppkes
e4c5e08f60
lavu/frame: av_frame_make_writable: set the channels on the new frame.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 16:00:43 +01:00
Hendrik Leppkes
2035cc3595
lavu/frame: copy all frame properties in av_frame_copy_props
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 16:00:28 +01:00
Carl Eugen Hoyos
f1b716c79b
avframe: Copy buffer type in copy_props.
...
Fixes VDPAU decoding with MPlayer.
2013-03-13 13:05:42 +01:00
Michael Niedermayer
150de78d7c
Merge commit 'd6d369bf1370999896500ae7eb5b9447ab635a3d'
...
* commit 'd6d369bf1370999896500ae7eb5b9447ab635a3d':
atomic: prefer gcc builtins over win32 atomics, if available.
avframe: copy reordered_opaque in copy_props
Conflicts:
libavutil/frame.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 02:08:41 +01:00
Michael Niedermayer
0d0f76ea56
Merge commit '6327c10702922eabcb1c6170abd3f03d23ce4c51'
...
* commit '6327c10702922eabcb1c6170abd3f03d23ce4c51':
atomic: fix CAS with armcc.
png: use av_mallocz_array() for the zlib zalloc function
libmp3lame: use the correct remaining buffer size when flushing
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 21:39:38 +01:00
Michael Niedermayer
d64b854075
Merge commit '666fe5da47d127074be7f0e2bac93db6af8b4a30'
...
* commit '666fe5da47d127074be7f0e2bac93db6af8b4a30':
atomic: Exclude the unsupported implementation headers from checkheaders
avconv: do not silently ignore unused codec AVOptions.
Conflicts:
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 21:34:24 +01:00
Ronald S. Bultje
6a701306db
dsputil: make selectable.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 19:56:58 +01:00
Michael Niedermayer
0cfbfaaa12
Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241'
...
* commit '7b89cd20d844cbe763ca34e63e99d110043cf241':
eamad: allocate a dummy reference frame when the real one is missing
Replace remaining includes of audioconvert.h with channel_layout.h
Replace some forgotten instances of PIX_FMT_* with AV_PIX_FMT_*.
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 15:44:15 +01:00
Michael Niedermayer
b2cd0d709a
Merge commit '8df23e938b4022d6e6e9e1180ea6418abae74fda'
...
* commit '8df23e938b4022d6e6e9e1180ea6418abae74fda':
lavc: postpone the removal of request_channels API.
AVFrame: deprecate all now unused fields
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 14:46:41 +01:00
Clément Bœsch
80661e0f55
buffer: use the atomic get instead of the add and fetch variant.
2013-03-12 12:12:49 +01:00
Michael Niedermayer
1ad542f11f
get_video_buffer: add vertical padding
...
Fix memory corruption
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 11:33:43 +01:00
Hendrik Leppkes
b91459e565
atomic: prefer gcc builtins over win32 atomics, if available.
...
The mingw win32 atomics appear to be faulty, so they should not be used
if the gcc ones are available.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-03-12 10:41:09 +01:00
Martin Storsjö
c48828f763
atomic: Check for __sync_val_compare_and_swap instead of __sync_synchronize
...
Not all gcc configurations have an implementation of all the atomic
operations, and some gcc configurations have some atomic builtins
implemented but not all.
Thus check for the most essential function, whose presence should
indicate that all others are present as well, since it can be used
to implement all the other ones.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-03-12 10:41:02 +01:00
Hendrik Leppkes
d6d369bf13
atomic: prefer gcc builtins over win32 atomics, if available.
...
The mingw win32 atomics appear to be faulty, so they should not be used
if the gcc ones are available.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-03-11 16:57:25 +02:00
Janne Grunau
fc8406d01e
avframe: copy reordered_opaque in copy_props
...
Fixes video playback in applications still using reordered_opaque.
2013-03-11 13:29:39 +01:00
Fabrizio Gennari
91b747ac78
mem: Fix usage of memalign() on DJGPP.
...
Credits to Khusraw of bttr-software.de forum.
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
2013-03-10 11:12:56 +01:00
Clément Bœsch
e53061154f
lavu/frame: fix not/note typo in doxy.
2013-03-10 02:07:34 +01:00
Michael Niedermayer
a05a44e205
Merge commit '7e350379f87e7f74420b4813170fe808e2313911'
...
* commit '7e350379f87e7f74420b4813170fe808e2313911':
lavfi: switch to AVFrame.
Conflicts:
doc/filters.texi
libavfilter/af_ashowinfo.c
libavfilter/audio.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/buffersink.c
libavfilter/buffersrc.c
libavfilter/buffersrc.h
libavfilter/f_select.c
libavfilter/f_setpts.c
libavfilter/fifo.c
libavfilter/split.c
libavfilter/src_movie.c
libavfilter/version.h
libavfilter/vf_aspect.c
libavfilter/vf_bbox.c
libavfilter/vf_blackframe.c
libavfilter/vf_delogo.c
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_fieldorder.c
libavfilter/vf_fps.c
libavfilter/vf_frei0r.c
libavfilter/vf_gradfun.c
libavfilter/vf_hqdn3d.c
libavfilter/vf_lut.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavfilter/vf_showinfo.c
libavfilter/vf_transpose.c
libavfilter/vf_vflip.c
libavfilter/vf_yadif.c
libavfilter/video.c
libavfilter/vsrc_testsrc.c
libavfilter/yadif.h
Following are notes about the merge authorship and various technical details.
Michael Niedermayer:
* Main merge operation, notably avfilter.c and video.c
* Switch to AVFrame:
- afade
- anullsrc
- apad
- aresample
- blackframe
- deshake
- idet
- il
- mandelbrot
- mptestsrc
- noise
- setfield
- smartblur
- tinterlace
* various merge changes and fixes in:
- ashowinfo
- blackdetect
- field
- fps
- select
- testsrc
- yadif
Nicolas George:
* Switch to AVFrame:
- make rawdec work with refcounted frames. Adapted from commit
759001c534
by Anton Khirnov.
Also, fix the use of || instead of | in a flags check.
- make buffer sink and src, audio and video work all together
Clément Bœsch:
* Switch to AVFrame:
- aevalsrc
- alphaextract
- blend
- cellauto
- colormatrix
- concat
- earwax
- ebur128
- edgedetect
- geq
- histeq
- histogram
- hue
- kerndeint
- life
- movie
- mp (with the help of Michael)
- overlay
- pad
- pan
- pp
- pp
- removelogo
- sendcmd
- showspectrum
- showwaves
- silencedetect
- stereo3d
- subtitles
- super2xsai
- swapuv
- thumbnail
- tile
Hendrik Leppkes:
* Switch to AVFrame:
- aconvert
- amerge
- asetnsamples
- atempo
- biquads
Matthieu Bouron:
* Switch to AVFrame
- alphamerge
- decimate
- volumedetect
Stefano Sabatini:
* Switch to AVFrame:
- astreamsync
- flite
- framestep
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-10 01:40:35 +01:00
Clément Bœsch
586ae70ba7
port FFmpeg lavc frame specificities to lavu functions.
2013-03-10 01:25:02 +01:00
Nicolas George
d1b456b0a8
lavu/frame: copy the channels field.
2013-03-10 01:25:02 +01:00
Anton Khirnov
6327c10702
atomic: fix CAS with armcc.
...
On the current code, armcc will fail with:
"libavutil/atomic_gcc.h", line 52: Error: #2771 : first argument must be
a pointer to integer or enumeration type
2013-03-09 08:36:40 +01:00
Martin Storsjö
309d6f5077
atomic: Add include guards to the implementation headers
...
This makes them pass standalone compilation tests. Previously,
they included atomic.h which included themselves again, leading to
double definitions.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-03-08 20:54:40 +01:00
Michael Niedermayer
307dc32a1a
Merge commit '77b2cd7b41d7ec8008b6fac753c04f77824c514c'
...
* commit '77b2cd7b41d7ec8008b6fac753c04f77824c514c':
AVFrame: add side data.
Conflicts:
libavutil/frame.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-08 20:41:41 +01:00
Michael Niedermayer
c4e8821732
Merge commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e'
...
* commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e':
Move AVFrame from lavc to lavu.
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-08 20:33:26 +01:00
Michael Niedermayer
fee484edaf
Merge commit 'ad0c9f2d5d81e22207c6ccecc426bf7306acc327'
...
* commit 'ad0c9f2d5d81e22207c6ccecc426bf7306acc327':
lavc: move AVFrame.hwaccel_picture_private to Picture.
Conflicts:
libavcodec/avcodec.h
libavcodec/mpegvideo.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-08 19:35:37 +01:00
Martin Storsjö
666fe5da47
atomic: Exclude the unsupported implementation headers from checkheaders
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-03-08 20:34:27 +02:00
Michael Niedermayer
532f31a695
Merge commit '1cec0624d0e6f48590283a57169b58b9fe8449d3'
...
* commit '1cec0624d0e6f48590283a57169b58b9fe8449d3':
AVBuffer: add a new API for buffer pools
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-08 16:06:20 +01:00
Michael Niedermayer
36099df521
Merge commit '8e401dbe90cc77b1f3067a917d9fa48cefa3fcdb'
...
* commit '8e401dbe90cc77b1f3067a917d9fa48cefa3fcdb':
lavu: add a new API for reference-counted data buffers.
Conflicts:
libavutil/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-08 16:01:00 +01:00
Michael Niedermayer
e92ba51fd7
Merge commit '65f1d45dcc71186ede72fff950996099d23359bd'
...
* commit '65f1d45dcc71186ede72fff950996099d23359bd':
lavu: add support for atomic operations.
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-08 15:48:27 +01:00
Michael Niedermayer
1f3a577353
Merge commit '4be368b504c6f4a03051448728fc62cd0ed506b2'
...
* commit '4be368b504c6f4a03051448728fc62cd0ed506b2':
avstring: Fix isxdigit to not accept non-hex characters
configure: Add missing videodsp dependencies to some decoders
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-08 15:37:21 +01:00
Michael Niedermayer
6c17ff84ad
Merge commit 'efa7f4202088c70caba11d7834641bc6eaf41830'
...
* commit 'efa7f4202088c70caba11d7834641bc6eaf41830':
Use the avstring.h locale-independent character type functions
avstring: Add locale independent versions of some ctype.h functions
Conflicts:
avprobe.c
doc/APIchanges
libavcodec/dvdsubdec.c
libavcodec/utils.c
libavutil/avstring.c
libavutil/avstring.h
libavutil/eval.c
libavutil/parseutils.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-08 14:57:41 +01:00
Martin Storsjö
e460aa3282
atomic: Check for __sync_val_compare_and_swap instead of __sync_synchronize
...
Not all gcc configurations have an implementation of all the atomic
operations, and some gcc configurations have some atomic builtins
implemented but not all.
Thus check for the most essential function, whose presence should
indicate that all others are present as well, since it can be used
to implement all the other ones.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-03-08 14:55:08 +02:00
Martin Storsjö
2240e92f05
atomic: Add include guards to the implementation headers
...
This makes them pass standalone compilation tests. Previously,
they included atomic.h which included themselves again, leading to
double definitions.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-03-08 12:00:06 +02:00
Anton Khirnov
0651e892e1
Replace remaining includes of audioconvert.h with channel_layout.h
2013-03-08 07:42:13 +01:00
Anton Khirnov
1296b1f6c0
AVFrame: deprecate all now unused fields
2013-03-08 07:41:21 +01:00
Anton Khirnov
77b2cd7b41
AVFrame: add side data.
2013-03-08 07:37:01 +01:00
Anton Khirnov
7ecc2d403c
Move AVFrame from lavc to lavu.
...
Add AVBuffer-based reference counting API to it.
2013-03-08 07:36:15 +01:00
Anton Khirnov
ad0c9f2d5d
lavc: move AVFrame.hwaccel_picture_private to Picture.
...
This field is private and should not be present in a public struct. It
is only used in DXVA with mpegvideo-based decoders currently.
2013-03-08 07:36:01 +01:00
Anton Khirnov
1cec0624d0
AVBuffer: add a new API for buffer pools
2013-03-08 07:33:28 +01:00
Anton Khirnov
8e401dbe90
lavu: add a new API for reference-counted data buffers.
2013-03-08 07:33:03 +01:00
Ronald S. Bultje
65f1d45dcc
lavu: add support for atomic operations.
...
These could be used for reference counting, or for keeping track of
decoding progress in references in multithreaded decoders.
Support is provided by gcc/msvc/suncc intrinsics, with a fallback using
pthread mutexes.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-03-08 07:32:36 +01:00
Carl Eugen Hoyos
de4811e910
Force using a 64bit intermediate when calculating calendar time with av_timegm().
...
Fixes a fate failure with icc 13.1
2013-03-08 02:42:33 +01:00
Martin Storsjö
4be368b504
avstring: Fix isxdigit to not accept non-hex characters
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-03-07 16:46:46 +02:00
Reimar Döffinger
efa7f42020
Use the avstring.h locale-independent character type functions
...
Make sure the behavior does not change with the locale.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-03-07 15:16:36 +02:00
Reimar Döffinger
12c5c1d3e3
avstring: Add locale independent versions of some ctype.h functions
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-03-07 15:16:26 +02:00
Stefano Sabatini
9767ec6b86
lavu: add escape API
...
The escape API will be useful to perform escaping programmatically, which
is required when crafting argument strings, and will be used for context
printing as well.
This is based on the ffescape tool code, with a few extensions and fixes.
2013-03-07 01:12:04 +01:00
Stefano Sabatini
ad48556135
lavu/eval: add native support to lte and lt functions
2013-03-05 15:15:45 +01:00
Stefano Sabatini
b1a2684936
lavu/opt: fix weird align
2013-03-05 13:20:14 +01:00
Stefano Sabatini
7b9a3df5d7
lavu/opt-test: do not explicitly set default value in test_ctx
...
Let av_opt_set_defaults() set the value, which is simpler and more
idiomatic.
2013-03-05 13:20:14 +01:00
Reimar Döffinger
88d55b827d
Remove incorrect use of ctype.h functions.
...
As far as I can tell the code should not change behaviour
depending on locale in any of these places.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-03-03 21:44:10 +01:00
Michael Niedermayer
4b335e73da
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
lls: Do not return from void functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-01 13:50:19 +01:00
Michael Niedermayer
7da1b235e8
Merge commit '4da950c0ae224b9b8ef952dadf614be2c050023e'
...
* commit '4da950c0ae224b9b8ef952dadf614be2c050023e':
lls: #ifndef --> #if in FF_API_ version guard
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-01 13:44:46 +01:00
Michael Niedermayer
28bb17ca36
Merge commit '399663be9d4a839b894c48a21b62926eb8497d72'
...
* commit '399663be9d4a839b894c48a21b62926eb8497d72':
lls: mark max_order as unsigned short
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-01 13:32:16 +01:00
Michael Niedermayer
76f8d3c8d9
Merge commit '9d4da474f5f40b019cb4cb931c8499deee586174'
...
* commit '9d4da474f5f40b019cb4cb931c8499deee586174':
lls: move to the private namespace
Conflicts:
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-01 13:19:00 +01:00
Michael Niedermayer
fb4b160756
Merge commit '7ac6d2423e9bf0f40c67be9a0ca7600b516b0282'
...
* commit '7ac6d2423e9bf0f40c67be9a0ca7600b516b0282':
lls: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-01 13:03:03 +01:00
Diego Biurrun
0b31129389
lls: Do not return from void functions
2013-03-01 01:44:35 +01:00
Diego Biurrun
4da950c0ae
lls: #ifndef --> #if in FF_API_ version guard
2013-03-01 01:44:35 +01:00
Luca Barbato
399663be9d
lls: mark max_order as unsigned short
...
The value is within 0 and 32.
Remove an `array subscript is below array bounds` warning.
2013-02-28 17:39:24 +01:00
Luca Barbato
9d4da474f5
lls: move to the private namespace
...
The functions are private.
2013-02-28 17:39:24 +01:00
Luca Barbato
7ac6d2423e
lls: K&R formatting cosmetics
2013-02-28 17:39:24 +01:00
Michael Niedermayer
4ba35194a9
Merge commit 'f935aca44c674d30e3ed940ef73bbad1228a5855'
...
* commit 'f935aca44c674d30e3ed940ef73bbad1228a5855':
av_memcpy_backptr: avoid an infinite loop for back = 0
4xm: check the return value of read_huffman_tables().
Conflicts:
libavcodec/4xm.c
libavutil/mem.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-24 12:22:51 +01:00
Anton Khirnov
f935aca44c
av_memcpy_backptr: avoid an infinite loop for back = 0
...
CC:libav-stable@libav.org
2013-02-23 09:16:15 +01:00
Stefano Sabatini
ce84c14ab1
lavu/parseutils: remove spurious "]]" in date format specification
2013-02-22 23:45:31 +01:00
Senthilnathan M
12a269a522
lavu/parseutils: allow MM:SS format for duration in av_parse_time()
...
Fix trac ticket #2258 .
Signed-off-by: Senthilnathan M <senthilnathan.maadasamy@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-02-22 23:43:46 +01:00
Michael Niedermayer
2c21d34ea4
avutil/mem: do a small set of checks for memalign hack before freeing.
...
These can detect some kinds of memory and or pointer corruptions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-22 20:42:33 +01:00
Mirjana Vulin
8d2eb5fe58
mips: optimization for float aac decoder (sbr module)
...
Signed-off-by: Mirjana Vulin <mvulin@mips.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-21 22:43:08 +01:00
Michael Niedermayer
f7b46d86de
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
intreadwrite: tomi: Add missing attributes.h #include for av_always_inline
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-20 12:04:50 +01:00
Diego Biurrun
c9ad5f59aa
intreadwrite: tomi: Add missing attributes.h #include for av_always_inline
2013-02-20 00:45:30 +01:00
Ronald S. Bultje
0c0828ecc5
x86: Use simple nop codes for <= sse (rather than <= mmx)
...
The "CentaurHauls family 6 model 9 stepping 8" family of CPUs
(flags: fpu vme de pse tsc msr cx8 sep mtrr pge mov pat mmx fxsr sse
up rng rng_en ace ace_en) SIGILLs on long nop codes.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-02-19 22:33:19 +02:00
Michael Niedermayer
29c8619a49
fate: add print() to the tests of eval
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-17 17:36:27 +01:00
Michael Niedermayer
09ece9fa6c
eval: print() support
...
This allows printing values via av_log from expressions.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-17 17:36:27 +01:00
James Almer
a56fd9edab
lavu: Fix checkheaders for x86/emms.h
...
internal.h doesn't need to include cpu.h anymore since
the relevant code was moved to x86/emms.h
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-17 00:18:16 +01:00
Michael Niedermayer
61fbb4cd57
Merge commit '4db96649ca700db563d9da4ebe70bf9fc4c7a6ba'
...
* commit '4db96649ca700db563d9da4ebe70bf9fc4c7a6ba':
avutil: Ensure that emms_c is always defined, even on non-x86
configure: Move MinGW CPPFLAGS setting to libc section, where it belongs
avutil: Move emms code to x86-specific header
Conflicts:
configure
libavutil/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-15 12:10:08 +01:00
Diego Biurrun
4db96649ca
avutil: Ensure that emms_c is always defined, even on non-x86
2013-02-14 19:29:04 +01:00
Diego Biurrun
ab441e20ff
avutil: Move emms code to x86-specific header
2013-02-14 17:37:34 +01:00
Paul B Mahol
cf73e0bff3
lavu/intreadwrite: add AV_[RW][BLN]48
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-13 15:35:54 +00:00
Michael Niedermayer
a63dc846b5
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
lavu: avoid clashing definition of E
doc: developer: Add a note about reserved system name space
Conflicts:
libavutil/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-12 14:10:36 +01:00
Michael Niedermayer
e2b703f536
Merge commit '62a43d30cc3b9b2460f2c926beb522df32493625'
...
* commit '62a43d30cc3b9b2460f2c926beb522df32493625':
crc: Move static data table from header to .c file
avcodec/rectangle: Remove nonsense assert
Conflicts:
libavcodec/rectangle.h
libavutil/crc_data.h
The assert is not removed as the assert ensures clear and easy
to debug failures instead of undefined behavior in case of
misalignment.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-12 13:11:14 +01:00
Michael Niedermayer
3ccda2b02b
Merge commit '375ef6528c9dd2db7f9881e232cb0ec3aa16970d'
...
* commit '375ef6528c9dd2db7f9881e232cb0ec3aa16970d':
libfdk-aacenc: Actually check for upper bounds of cutoff
arm: Fall back to runtime cpu feature detection via /proc/cpuinfo
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-12 12:41:09 +01:00
Luca Barbato
fd1abf4269
lavu: avoid clashing definition of E
...
E is usually defined as a shorthand for AV_OPT_FLAG_ENCODING_PARAM.
Rename the single expansion E(x) now used in libavutil to E1.
2013-02-12 11:47:43 +01:00
Ronald S. Bultje
b582af1ed7
Use simple nop codes for <= sse (rather than <= mmx).
...
The "CPU: CentaurHauls family 6 model 9 stepping 8" family of CPUs
(flags: fpu vme de pse tsc msr cx8 sep mtrr pge mov pat mmx fxsr sse
up rng rng_en ace ace_en) SIGILLs on long nop codes.
Change-Id: I7e7c52a2191006df30a9aadbc40d481a1db89106
2013-02-11 23:38:57 +01:00
Diego Biurrun
62a43d30cc
crc: Move static data table from header to .c file
...
Having static data tables in header files is a potential source of trouble.
2013-02-11 16:48:44 +01:00
Martin Storsjö
ab8f1a6989
arm: Fall back to runtime cpu feature detection via /proc/cpuinfo
...
On recent android versions, /proc/self/auxw is unreadable
(unless the process is running running under the shell uid or
in debuggable mode, which makes it hard to notice). See
http://b.android.com/43055 and
https://android-review.googlesource.com/51271 for more information
about the issue.
This makes sure e.g. neon optimizations are enabled at runtime in
android apps even when built in release mode, if configured to
use the runtime detection.
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-02-11 17:15:15 +02:00
Carl Eugen Hoyos
e149127bb2
Call the common 7.1 wide channel layout "7.1(wide)".
...
Rename the uncommon variant with side speakers to "7.1(wide-side)".
2013-02-09 18:14:46 +01:00
Paul B Mahol
faac85005c
lavu/internal: rename macro E(x) to EXPAND(x)
...
Fixes bunch of warnings of E redefinition under clang.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-09 16:26:30 +00:00
Michael Niedermayer
6b2e65078c
Merge commit '218aefce4472dc02ee3f12830a9a894bf7916da9'
...
* commit '218aefce4472dc02ee3f12830a9a894bf7916da9':
dsputil: Move LOCAL_ALIGNED macros to libavutil
Conflicts:
libavcodec/dvdec.c
libavcodec/imc.c
libavcodec/mpegvideo_motion.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09 14:33:57 +01:00
Diego Biurrun
218aefce44
dsputil: Move LOCAL_ALIGNED macros to libavutil
2013-02-08 23:13:37 +01:00
Dave Rice
71956371a7
lavu/parseutils: add digital cinema frame sizes
...
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-02-03 22:57:04 +01:00
Michael Niedermayer
086566a557
dict: fix memleak
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-01 03:56:51 +01:00
Mirjana Vulin
2b6a8187a6
mips: optimization for float aac decoder (core module)
...
Signed-off-by: Mirjana Vulin <mvulin@mips.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-31 01:23:09 +01:00
Michael Niedermayer
32de283103
avstring: fix "warning: return discards const qualifier from pointer target type"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-30 16:54:15 +01:00
Paweł Hajdan, Jr
1d81f7448c
dict.c: use av_mallocz instead of av_realloc
...
Memory passed to av_realloc must come from malloc,
calloc or realloc, and not e.g. memalign. realloc(3):
The realloc() function changes the size of the memory block pointed to
by ptr to size bytes. (...) Unless ptr is NULL, it must have been
returned by an earlier call to malloc(), calloc() or realloc().
The issue has been found by debugallocation, a part of google-perftools:
http://code.google.com/p/gperftools/ .
This makes fate pass when using LD_PRELOAD-ed debugallocation.
See also earlier discussion
http://ffmpeg.org/pipermail/ffmpeg-devel/2013-January/137234.html
Signed-off-by: Paweł Hajdan, Jr <phajdan@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-29 20:23:02 +01:00
Michael Niedermayer
3cd9849d9c
eval: fix 'warning: ignoring return value of strtod, declared with attribute warn_unused_result'
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-29 16:33:32 +01:00
Michael Niedermayer
e7e14bc69a
Merge commit '38c1466ca41c73c7ce347da702362cb69c151716'
...
* commit '38c1466ca41c73c7ce347da702362cb69c151716':
dict: add av_dict_parse_string()
doc: support multitable in texi2pod
Conflicts:
doc/APIchanges
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 'b85a5e87af4254b80913fe33591d96361f30832b'
...
* commit 'b85a5e87af4254b80913fe33591d96361f30832b':
lavu: Add av_strnstr()
h264: Allow discarding the cropping information from SPS
Conflicts:
Changelog
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-25 14:36:45 +01:00
Michael Niedermayer
b2d0c5bd13
Merge commit '33552a5f7b6ec7057516f487b1a902331f8c353e'
...
* commit '33552a5f7b6ec7057516f487b1a902331f8c353e':
arm: Add mathops.h to ARCH_HEADERS list
avstring: K&R formatting cosmetics
Conflicts:
libavutil/avstring.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 '73b704ac609d83e0be124589f24efd9b94947cf9'
...
* commit '73b704ac609d83e0be124589f24efd9b94947cf9':
arm: Add some missing header #includes
floatdsp: move scalarproduct_float from dsputil to avfloatdsp.
Conflicts:
libavcodec/acelp_pitch_delay.c
libavcodec/amrnbdec.c
libavcodec/amrwbdec.c
libavcodec/ra288.c
libavcodec/x86/dsputil_mmx.c
libavutil/x86/float_dsp.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23 14:31:55 +01:00
Michael Niedermayer
24604ebaf8
Merge commit '5959bfaca396ecaf63a8123055f499688b79cae3'
...
* commit '5959bfaca396ecaf63a8123055f499688b79cae3':
floatdsp: move butterflies_float from dsputil to avfloatdsp.
Conflicts:
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/imc.c
libavcodec/mpegaudiodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23 14:13:54 +01:00
Michael Niedermayer
6e6e170898
Merge commit '42d324694883cdf1fff1612ac70fa403692a1ad4'
...
* commit '42d324694883cdf1fff1612ac70fa403692a1ad4':
floatdsp: move vector_fmul_reverse from dsputil to avfloatdsp.
Conflicts:
libavcodec/arm/dsputil_init_vfp.c
libavcodec/arm/dsputil_vfp.S
libavcodec/dsputil.c
libavcodec/ppc/float_altivec.c
libavcodec/x86/dsputil.asm
libavutil/x86/float_dsp.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23 14:04:50 +01:00
Michael Niedermayer
b1b870fbd7
Merge commit '55aa03b9f8f11ebb7535424cc0e5635558590f49'
...
* commit '55aa03b9f8f11ebb7535424cc0e5635558590f49':
floatdsp: move vector_fmul_add from dsputil to avfloatdsp.
Conflicts:
libavcodec/dsputil.c
libavcodec/x86/dsputil.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 'd633d12b2cc999cee3ac25bf9a810fe7ff03726d'
...
* commit 'd633d12b2cc999cee3ac25bf9a810fe7ff03726d':
x86inc: Add cvisible macro for C functions with public prefix
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-19 13:11:41 +01:00
Michael Niedermayer
1b03e09198
Merge commit 'ef5d41a5534b65f03d02f2e11a503ab8416bfc3b'
...
* commit 'ef5d41a5534b65f03d02f2e11a503ab8416bfc3b':
x86inc: Rename "program_name" to "private_prefix"
configure: Run SHFLAGS through ldflags_filter()
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 '80ac87c13dc8c6c063e26a464c5c542357c0583f'
...
* commit '80ac87c13dc8c6c063e26a464c5c542357c0583f':
lavc: support ZenoXVID custom tag
libcdio: support recent cdio-paranoia
float_dsp: Add #ifdef HAVE_INLINE_ASM around vector_fmul_window
theora: Skip zero-sized headers
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 '0eecafc948b74c247ebbc59f18f508db5d590d0b'
...
* commit '0eecafc948b74c247ebbc59f18f508db5d590d0b':
configure: Make the new srtp protocol depend on the rtp protocol
lavf: Add a fate test for the SRTP functions
lavu: Add a fate test for the HMAC API
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-16 12:07:27 +01:00
Michael Niedermayer
68f92a70f1
Merge commit 'dae1d507af94261bafd3b11549884e5d1eca590e'
...
* commit 'dae1d507af94261bafd3b11549884e5d1eca590e':
x86: Add PAVGB macro to abstract pavgb/pavgusb instruction via cpuflags
vf_fps: add final flushed frames to the dropped frame count
rv34_parser: Adjust #if for disabling individual parsers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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