OSDN Git Service
Michael Niedermayer [Sun, 24 Aug 2014 01:58:11 +0000 (03:58 +0200)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
fate: Fix ffprobe tests with --target-path set.
doc/ffmpeg: Try to clarify that the input option -r is not the same as -framerate.
Do not print a useless error number if mov header reading fails.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
ThomasVolkert [Sat, 23 Aug 2014 19:25:39 +0000 (21:25 +0200)]
Add support for H.261 RTP payload format (RFC 4587)
Carl Eugen Hoyos [Sat, 16 Aug 2014 10:19:05 +0000 (12:19 +0200)]
fate: Fix ffprobe tests with --target-path set.
Carl Eugen Hoyos [Sun, 24 Aug 2014 00:49:06 +0000 (02:49 +0200)]
doc/ffmpeg: Try to clarify that the input option -r is not the same as -framerate.
Carl Eugen Hoyos [Sun, 24 Aug 2014 00:45:58 +0000 (02:45 +0200)]
Do not print a useless error number if mov header reading fails.
The error string is printed by ffmpeg as for other demuxers.
Michael Niedermayer [Sat, 23 Aug 2014 23:54:45 +0000 (01:54 +0200)]
avcodec/tiff: Make pixel format checks tighter
Fixes assertion failure with imgsrc001-lzma.tiff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sat, 23 Aug 2014 02:39:57 +0000 (23:39 -0300)]
lavc/tiff: add support for LZMA compression
Derived from deflate code.
Requires liblzma.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 23 Aug 2014 20:46:06 +0000 (22:46 +0200)]
Merge commit '
749b1f1359b5af0a08221923b016551b18ab6171'
* commit '
749b1f1359b5af0a08221923b016551b18ab6171':
configure: add --enable-rpath
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 23 Aug 2014 20:08:15 +0000 (22:08 +0200)]
Merge commit '
5caf039ba2b4be067568a30146f29008d8db28d0'
* commit '
5caf039ba2b4be067568a30146f29008d8db28d0':
Prepare for 11_beta2 Release
Conflicts:
RELEASE
Not merged as theres no FFmpeg 11_beta2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 23 Aug 2014 19:39:14 +0000 (21:39 +0200)]
Merge commit '
f9f34cb9983ec6f4ef119c34b726d3b39c143110'
* commit '
f9f34cb9983ec6f4ef119c34b726d3b39c143110':
ogg: Use separate classes for the aliases
Conflicts:
libavformat/oggenc.c
See:
2ccc6ff03acc3ca31db1aeb828c747d05b5cb6aa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sat, 23 Aug 2014 18:03:10 +0000 (20:03 +0200)]
avutil/pixelutils: faster pixelutils_sad_16x16
501 to 439 decicycles.
See
45c7f3997ea11c3d1007b2126b1c0049a8c27105.
Reinhard Tartler [Sat, 23 Aug 2014 14:04:26 +0000 (10:04 -0400)]
configure: add --enable-rpath
This option facilitates testing shared libarary builds: for instance
fate builders do no longer need to set LD_LIBRARY_PATH as the binaries will
get the right search paths hardcoded into their executable file.
This option is only meant to be used for testing purposes: The installed
libraries must not move around in the file system, and doing so will
cause a lot of subtle problems. For more information why using RPATH is
dangerous, please refer to
https://blog.flameeyes.eu/2010/06/the-why-and-how-of-rpath
Reinhard Tartler [Sat, 23 Aug 2014 14:12:16 +0000 (10:12 -0400)]
Prepare for 11_beta2 Release
Clément Bœsch [Sat, 23 Aug 2014 14:07:55 +0000 (16:07 +0200)]
doc/filters: fix Shwo/Show typo
Reimar Döffinger [Tue, 29 Jul 2014 19:16:35 +0000 (21:16 +0200)]
dict.c: Free non-strduped av_dict_set arguments on error.
Unfortunately this was not explicitly documented and thus
might be risky.
But all uses I could find in FFmpeg and one in VLC had a memleak
in these cases, and I could not find any that relied on the previous
behaviour.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Clément Bœsch [Thu, 14 Aug 2014 20:30:55 +0000 (22:30 +0200)]
avutil/pixelutils: faster pixelutils_sad_[au]_16x16
~560 → ~500 decicycles
This is following the comments from Michael in
https://ffmpeg.org/pipermail/ffmpeg-devel/2014-August/160599.html
Using 2 registers for accumulator didn't help. On the other hand,
some re-ordering between the movs and psadbw allowed going ~538 to ~500.
Muhammad Faiz [Sat, 23 Aug 2014 08:01:22 +0000 (10:01 +0200)]
avfilter/showcqt: add fontcolor option
Michael Niedermayer [Thu, 21 Aug 2014 14:33:03 +0000 (16:33 +0200)]
avcodec/h264_slice: More complete cleanup in h264_slice_header_init()
Fixes null pointer dereference
Fixes Ticket3873
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 21 Aug 2014 14:15:16 +0000 (16:15 +0200)]
avcodec/h264: do proper cleanup in ff_h264_alloc_tables() in case DPB alloc fails
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Sat, 23 Aug 2014 00:42:18 +0000 (02:42 +0200)]
ogg: Use separate classes for the aliases
Unbreak
051aadeed104ecbe8ee4850ec2d7e5394f5e1ccd
Michael Niedermayer [Fri, 22 Aug 2014 23:34:28 +0000 (01:34 +0200)]
avcodec/imc: Fix bitstream buffer padding
Fixes buffer overread
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Fri, 22 Aug 2014 14:49:54 +0000 (16:49 +0200)]
h264: do not return on sidedata allocation failure
Not having allocated it is not a good reason to leave the object
in an undetermined state. Though a particular setting like the
AV_EF_* flags could be useful to control that behaviour.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 22 Aug 2014 21:00:41 +0000 (23:00 +0200)]
avcodec/hevc_ps: fix 1 vs. 0 typo
Found-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Fri, 22 Aug 2014 02:12:10 +0000 (19:12 -0700)]
vidstabutils: improve documentation
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Fri, 22 Aug 2014 02:12:09 +0000 (19:12 -0700)]
vidstab*: Remove accidentally exported av_2_vs_pixel_format()
Also correctly namespace other functions in vidstabutils, and decrease
difference from Libav.
Initial-patch-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 22 Aug 2014 19:55:00 +0000 (21:55 +0200)]
Merge commit '
3526ab891c28396ada8b58bf7647309bab30de1d'
* commit '
3526ab891c28396ada8b58bf7647309bab30de1d':
qt-faststart: Undefine fseeko/ftello before defining them
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 22 Aug 2014 19:49:00 +0000 (21:49 +0200)]
Merge commit '
1019b7c4edff537499c4a6cb0d65abae04ce58f6'
* commit '
1019b7c4edff537499c4a6cb0d65abae04ce58f6':
os_support: Undefine lseek/stat/fstat before defining them
Conflicts:
libavformat/os_support.h
See:
ef122ff5072463366c020157f0a27aad7e6610db
See:
ed3c0fe85dd5c228e98126b18e50ffb617e77070
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 22 Aug 2014 19:14:43 +0000 (21:14 +0200)]
Merge commit '
051aadeed104ecbe8ee4850ec2d7e5394f5e1ccd'
* commit '
051aadeed104ecbe8ee4850ec2d7e5394f5e1ccd':
ogg: Provide aliases for Speex, Opus and audio-only ogg
Conflicts:
Changelog
libavformat/oggenc.c
libavformat/version.h
See:
2ccc6ff03acc3ca31db1aeb828c747d05b5cb6aa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 22 Aug 2014 18:59:49 +0000 (20:59 +0200)]
Merge commit '
cb7b1a2dfb547ab78342a7a9d5cd729d77d90421'
* commit '
cb7b1a2dfb547ab78342a7a9d5cd729d77d90421':
electronicarts: set the framerate for TGQ/TQI
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 22 Aug 2014 17:52:49 +0000 (19:52 +0200)]
Merge commit '
7b6aae23e12f41cdfac7f1069debfe44d9a3d136'
* commit '
7b6aae23e12f41cdfac7f1069debfe44d9a3d136':
electronicarts: read the framerate for MAD
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Fri, 22 Aug 2014 09:31:45 +0000 (09:31 +0000)]
wavpackenc: reset trailer info on block encoding
In some cases, in particular if several blocks are needed because of
the channel layout (e.g. 2.1), the information used to write the
trailing bits terminating the sample data was not reset.
This would cause potential desync on the decoder, although decoded
samples were actually mostly fine.
Fixes ticket #3879.
Christophe Gisquet [Fri, 22 Aug 2014 09:31:44 +0000 (09:31 +0000)]
wavpack: check number of channels
This means container and codec disagree. The codec is supposed to
know better so this could be an error instead.
Michael Niedermayer [Fri, 22 Aug 2014 17:01:26 +0000 (19:01 +0200)]
Merge commit '
4d6c5152849e23a4cc0f6a6ac2880c01ebcd301b'
* commit '
4d6c5152849e23a4cc0f6a6ac2880c01ebcd301b':
electronicarts: do not fail on zero-sized chunks
Conflicts:
libavformat/electronicarts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 22 Aug 2014 16:49:22 +0000 (18:49 +0200)]
Merge commit '
dc4b2e7d33903a6b9380e8a84b22b3a20facbb08'
* commit '
dc4b2e7d33903a6b9380e8a84b22b3a20facbb08':
rv34: use ff_mpeg_update_thread_context only when decoder is fully initialized
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 22 Aug 2014 16:43:26 +0000 (18:43 +0200)]
Merge commit '
b0bfd09f88da8b7c7666faf0ac7d5e74559dba9f'
* commit '
b0bfd09f88da8b7c7666faf0ac7d5e74559dba9f':
configure: Suppress "potentially uninitialized variable" warnings from MSVC
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Fri, 15 Aug 2014 19:43:48 +0000 (21:43 +0200)]
qt-faststart: Undefine fseeko/ftello before defining them
This avoids a number of redefinition warnings on MinGW64.
Diego Biurrun [Fri, 15 Aug 2014 19:42:56 +0000 (21:42 +0200)]
os_support: Undefine lseek/stat/fstat before defining them
This avoids a number of redefinition warnings on MinGW64.
Christophe Gisquet [Mon, 28 Jul 2014 17:17:28 +0000 (17:17 +0000)]
x86: hevcdsp: use compilation-time-fixed constant
The stride for some buffers is known.
Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Mon, 28 Jul 2014 10:13:06 +0000 (12:13 +0200)]
hevcdsp: remove more instances of compile-time-fixed parameters
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Mon, 28 Jul 2014 17:17:26 +0000 (17:17 +0000)]
hevcdsp: remove compilation-time-fixed parameter
The dststride parameter is always MAX_PB_SIZE.
Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Mon, 28 Jul 2014 17:17:25 +0000 (17:17 +0000)]
hevc: move MAX_PB_SIZE declaration
Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Sun, 17 Aug 2014 18:55:37 +0000 (20:55 +0200)]
ogg: Provide aliases for Speex, Opus and audio-only ogg
Since they are aliases for ogg enabling any of them enables ogg as well.
Christophe Gisquet [Mon, 28 Jul 2014 06:55:26 +0000 (08:55 +0200)]
x86: hevc_mc: assume 2nd source stride is 64
Reviewed-by: Mickaël Raulet <mraulet@gmail.com
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Wed, 20 Aug 2014 06:06:41 +0000 (06:06 +0000)]
electronicarts: set the framerate for TGQ/TQI
It is hardcoded to 15fps.
Anton Khirnov [Wed, 20 Aug 2014 05:52:44 +0000 (05:52 +0000)]
electronicarts: read the framerate for MAD
Anton Khirnov [Wed, 20 Aug 2014 05:40:53 +0000 (05:40 +0000)]
electronicarts: do not fail on zero-sized chunks
At least one FATE sample contains such chunks and happens to work simply
by accident (due to find_stream_info() swallowing the error).
CC: libav-stable@libav.org
Janne Grunau [Thu, 21 Aug 2014 11:26:33 +0000 (13:26 +0200)]
rv34: use ff_mpeg_update_thread_context only when decoder is fully initialized
MpegEncContext based decoders are only fully initialized after the first
ff_thread_get_buffer() call. The RV30/40 decoders may fail before a frame
buffer was requested. ff_mpeg_update_thread_context() fails on half
initialized MpegEncContexts. Since this can only happen before a the
first frame was decoded there is no need to call
ff_mpeg_update_thread_context().
Based on patches by John Stebbins and tested by John Stebbins.
CC: libav-stable@libav.org
Christophe Gisquet [Fri, 22 Aug 2014 09:31:43 +0000 (09:31 +0000)]
wavpackenc: make assert more thorough
It was only validating that normal data wasn't filling the buffer.
However, extra data may be written afterwards.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Fri, 22 Aug 2014 09:31:42 +0000 (09:31 +0000)]
wavpackenc: fix number of samples per block
Currently, the encoder will try to reduce it down to 150000, but the
decoder will complain starting at 131072 (WV_MAX_SAMPLES). Therefore,
change the loop limit.
Fixes ticket #3881.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 14 Aug 2014 03:32:44 +0000 (05:32 +0200)]
avcodec/fic: Check if a frame is available before using it
Fixes null pointer dereference
Fixes: ficvf.avi
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 21 Aug 2014 23:15:57 +0000 (01:15 +0200)]
avcodec: fix aac/ac3 parser bitstream buffer size
Buffers containing copies of the AAC and AC3 header bits were not padded
before parsing, violating init_get_bits() buffer padding requirement,
leading to potential buffer read overflows.
This change adds FF_INPUT_BUFFER_PADDING_SIZE bytes to the bit buffer
for parsing the header in each of aac_parser.c and ac3_parser.c.
Based on patch by: Matt Wolenetz <wolenetz@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Wed, 20 Aug 2014 08:10:44 +0000 (08:10 +0000)]
dpxenc: fix padding in encode_gbrp12
It was added per pixel instead of per line.
Reviewed-by: James Darnley <james.darnley@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Thu, 21 Aug 2014 16:57:18 +0000 (18:57 +0200)]
hevc_ps: check overflow and test alternate syntax
Some streams were found to have what appeared to be truncated SPS.
Their syntax seem to be valid at least until the end of the VUI, so
try that syntax if the parsing would overflow the SPS in the
conforming syntax.
Fixes ticket #3872.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 21 Aug 2014 19:56:33 +0000 (21:56 +0200)]
Merge commit '
13c90bc9a359e969cc2b7f7e8199b02a0e4c6ec9'
* commit '
13c90bc9a359e969cc2b7f7e8199b02a0e4c6ec9':
adts: Return more meaningful error codes
Conflicts:
libavformat/adtsenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 21 Aug 2014 19:47:43 +0000 (21:47 +0200)]
Merge commit '
593aaee953f8b07c141ff115e67bae85ef0350c7'
* commit '
593aaee953f8b07c141ff115e67bae85ef0350c7':
setpts: Add missing inttypes.h #include for PRId64
Conflicts:
libavfilter/setpts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 21 Aug 2014 19:37:39 +0000 (21:37 +0200)]
Merge commit '
8fc6a70c2167b645b7a37d0cbc0e276e7b787cc9'
* commit '
8fc6a70c2167b645b7a37d0cbc0e276e7b787cc9':
mpeg12enc: Add missing #include for PICT_FRAME
See:
9517900bef528527d8507da5a1992f99513d71b4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 21 Aug 2014 19:30:31 +0000 (21:30 +0200)]
Merge commit '
7cb66ebc0be48489785f7166c9d15eac594b0763'
* commit '
7cb66ebc0be48489785f7166c9d15eac594b0763':
error_resilience: Drop asserts from guess_mv()
Conflicts:
libavcodec/error_resilience.c
Not merged, the asserts in FFmpeg build and work fine
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 21 Aug 2014 19:23:14 +0000 (21:23 +0200)]
Merge commit '
11cd727fbd603197cb1e49654fce3352d56f8fd8'
* commit '
11cd727fbd603197cb1e49654fce3352d56f8fd8':
vsrc_movie: Adjust a silly typo from
b977b287f61fea48ecd6251d54a26334213b7ec6
Conflicts:
libavfilter/src_movie.c
No change, the typo is not part of FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Wed, 20 Aug 2014 22:36:29 +0000 (19:36 -0300)]
x86/hevc_res_add: refactor ff_hevc_transform_add{16,32}_8
* Reduced xmm register count to 7 (As such they are now enabled for x86_32).
* Removed four movdqa (affects the sse2 version only).
* pxor is now used to clear m0 only once.
~5% faster.
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Christophe Gisquet [Tue, 19 Aug 2014 12:05:56 +0000 (14:05 +0200)]
wavpackenc: assert on too small buffer
bytestream2_* will not cause buffer overflow, but in that case, this means
the allocation would be incorrect and the encoded result invalid. Therefore,
assert no overflow occurred.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Fri, 15 Aug 2014 18:03:27 +0000 (20:03 +0200)]
configure: Suppress "potentially uninitialized variable" warnings from MSVC
The same is done for GCC and clang already.
Michael Niedermayer [Thu, 21 Aug 2014 15:28:11 +0000 (17:28 +0200)]
avformat/mov: use 64bit for size in mov_skip_multiple_stsd()
Fixes integer overflow
Fixes Ticket 3866
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Mon, 18 Aug 2014 12:52:08 +0000 (14:52 +0200)]
doc/filters/apad: extend documentation
Stefano Sabatini [Mon, 18 Aug 2014 12:51:25 +0000 (14:51 +0200)]
lavfi/apad: fix logic when whole_len or pad_len options are specified
In particular, allow pad_len and whole_len to have value set to 0, which
means that no padding will be added. Previously a value set to 0 meant
that that the filter had to pad forever.
The new semantics is clearer, also simplifies scripting since the option
value might be automatically computed, so that no checks need to be done
in case it is 0.
The old semantics was never documented and the logic was broken (the
filter was always adding samples indefinitely), so this should not break
backward compatibility.
Christophe Gisquet [Thu, 21 Aug 2014 10:21:07 +0000 (12:21 +0200)]
imc: reject files with unfathomable sampling rates
With huge sampling rates, the table derivation method does not converge fast
enough. While fixing it using e.g. Newton-Rhapson-like methods (the curve is
nicely convex) is possible, it is much simpler to reject these cases.
The value of 96000 was arbitrarily chosen as a realistic value, though
1000000 would still work and converge.
Fixes ticket #3868.
Suggested-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 21 Aug 2014 10:16:07 +0000 (12:16 +0200)]
avfilter/vf_lenscorrection: fix memleak
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nidhi Makhijani [Fri, 15 Aug 2014 11:37:24 +0000 (17:07 +0530)]
adts: Return more meaningful error codes
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diego Biurrun [Wed, 20 Aug 2014 16:54:50 +0000 (09:54 -0700)]
setpts: Add missing inttypes.h #include for PRId64
Also convert a debug av_log() to av_dlog().
Diego Biurrun [Wed, 20 Aug 2014 16:48:54 +0000 (09:48 -0700)]
mpeg12enc: Add missing #include for PICT_FRAME
Diego Biurrun [Wed, 20 Aug 2014 16:35:08 +0000 (09:35 -0700)]
error_resilience: Drop asserts from guess_mv()
The asserts check struct members that are not referenced in guess_mv()
and one of them fails to compile.
Diego Biurrun [Wed, 20 Aug 2014 16:56:26 +0000 (09:56 -0700)]
Clément Bœsch [Thu, 21 Aug 2014 10:36:28 +0000 (12:36 +0200)]
doc/APIChanges: fill 2 hashes from my recent API additions
Clément Bœsch [Wed, 20 Aug 2014 21:24:17 +0000 (23:24 +0200)]
avutil/motion_vector.h: fix coordinate types
See
b0352b1997a83f1b6b27919b94aab539f099b25b for more information on the
feature.
Michael Niedermayer [Wed, 20 Aug 2014 12:15:12 +0000 (14:15 +0200)]
avfilter/vf_lenscorrection: get rid of floats in init code
The only remaining floats are in the user interface, they are left as they
should not cause a problem in practice
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 20 Aug 2014 12:05:20 +0000 (14:05 +0200)]
avfilter/vf_lenscorrection: get rid of all floats per frame
there are some still left for 1 time initialization
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 20 Aug 2014 11:19:26 +0000 (13:19 +0200)]
avfilter/vf_lenscorrection: get rid of some floats
Christophe Gisquet [Wed, 20 Aug 2014 23:19:47 +0000 (23:19 +0000)]
fate: add test for old (v1) huffyuv and rgba
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Wed, 20 Aug 2014 23:19:48 +0000 (23:19 +0000)]
huffyuvdec: fix old (v1) rgba
Commit
deadcf5e misplaced a hunk.
Fixes ticket #3877.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Wed, 20 Aug 2014 20:32:06 +0000 (22:32 +0200)]
avfilter/showwaves: align const mode values (cosmetics)
Clément Bœsch [Wed, 20 Aug 2014 20:30:38 +0000 (22:30 +0200)]
doc/filters: fix cline option name recently added
Clément Bœsch [Thu, 26 Dec 2013 12:39:49 +0000 (13:39 +0100)]
avfilter/showwaves: add split_channels option
Clément Bœsch [Thu, 26 Dec 2013 11:57:20 +0000 (12:57 +0100)]
avfilter/showwaves: split out draw sample code
Clément Bœsch [Thu, 26 Dec 2013 11:08:24 +0000 (12:08 +0100)]
avfilter/showwaves: add "cline" mode (centered line)
James Almer [Wed, 20 Aug 2014 02:52:05 +0000 (23:52 -0300)]
x86/hecv_res_add: add ff_hevc_transform_add{8,16,32}_8_avx
~15% faster than sse2
Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Lou Logan [Tue, 19 Aug 2014 23:16:20 +0000 (15:16 -0800)]
doc/ffmpeg: fix metadata language example
Signed-off-by: Lou Logan <lou@lrcd.com>
Michael Niedermayer [Wed, 20 Aug 2014 16:49:01 +0000 (18:49 +0200)]
avfilter/avf_showspectrum: fix colums typo
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 20 Aug 2014 16:27:25 +0000 (18:27 +0200)]
avformat/asfdec: Check av_new_packet()s return code
Fixes CID1041093
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 20 Aug 2014 14:45:08 +0000 (16:45 +0200)]
avformat/nutdec: always initialize event_flags
Fixes: CID1231990
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 20 Aug 2014 01:38:30 +0000 (03:38 +0200)]
avcodec/hevc_ps: do cleanup in case of unsupported bit depth
Fixes memleak
Fixes CID1231989
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Mon, 18 Aug 2014 12:52:38 +0000 (14:52 +0200)]
lavfi/apad: fix if_( style
James Almer [Wed, 20 Aug 2014 00:30:55 +0000 (21:30 -0300)]
x86/hevc_res_add: fix register count in hevc_transform_add{16,32}_10_avx2
Signed-off-by: James Almer <jamrial@gmail.com>
Pierre Edouard Lepere [Mon, 18 Aug 2014 08:01:09 +0000 (10:01 +0200)]
x86: hevc: adding transform_add
Reviewed-by: James Almer <jamrial@gmail.com>
Approved-by: Ronald S. Bultje
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 19 Aug 2014 22:23:15 +0000 (00:23 +0200)]
Merge commit '
67a7695c142561fe60f21adffe89c133385d37c9'
* commit '
67a7695c142561fe60f21adffe89c133385d37c9':
avfilter: Remove unused variable from ff_get_video_buffer()
Conflicts:
libavfilter/video.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Tue, 19 Aug 2014 20:33:40 +0000 (17:33 -0300)]
lavc/tiff: add support for YUV deflate
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 19 Aug 2014 20:04:01 +0000 (17:04 -0300)]
lavc/tiff: move unpack_yuv() above the deflate functions
Signed-off-by: James Almer <jamrial@gmail.com>
Jon Morley [Tue, 19 Aug 2014 18:17:49 +0000 (11:17 -0700)]
avcodec/adpcm: Fix incorrect AVSampleFormat for sample_fmts_s16p
The AVSampleFormat list of sample_fmts_s16p is missing the trailing "P" for planar formats. AV_SAMPLE_FMT_S16 vs AV_SAMPLE_FMT_S16P
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 19 Aug 2014 19:08:34 +0000 (21:08 +0200)]
avcodec/tiff: Check that pix_fmt is a yuv variant for TIFF_PHOTOMETRIC_YCBCR
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 19 Aug 2014 18:57:42 +0000 (20:57 +0200)]
avcodec/tiff: do not use photometric to detect pix_fmt
They should match but they do not always
Fixes assertion failure
no testcase with unmodified source available
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Moritz Barsnick [Tue, 19 Aug 2014 12:28:35 +0000 (14:28 +0200)]
align and correct messages regarding bitstream filters
The messages regarding the recommended use of bitstream filters are somewhat different.
This also adds the ":v" stream specifier to "-bsf h264_mp4toannexb".
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 19 Aug 2014 17:58:17 +0000 (19:58 +0200)]
Merge commit '
b977b287f61fea48ecd6251d54a26334213b7ec6'
* commit '
b977b287f61fea48ecd6251d54a26334213b7ec6':
vsrc_movie: Avoid a variable indirection in movie_get_frame()
Conflicts:
libavfilter/src_movie.c
no change as theres no such code in src_movie.c in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>