]>
git.sesse.net Git - ffmpeg/log
James Almer [Sat, 14 Sep 2013 22:17:55 +0000 (19:17 -0300)]
matroskaenc: Bump DocTypeVersion to 4
The muxer has been creating files with v4 elements for some time now,
and especially now that we can mux non-experimental Opus files, reporting
the DocTypeVersion as 2 is not correct.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Dave Rice [Sat, 14 Sep 2013 19:36:16 +0000 (15:36 -0400)]
Adding a line to Changelog about FFV1 version 1.3 now being stable
FFV1 version 1.3 is non-experimental as of Aug 26, 2013. Adding that to the changelog.
Signed-Off By: dericed <dave@dericed.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sat, 14 Sep 2013 14:27:15 +0000 (14:27 +0000)]
avformat/nutenc: use av_reallocp_array()
Fixes memleak on allocation error.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sat, 14 Sep 2013 14:23:00 +0000 (14:23 +0000)]
avformat/nutenc: use av_calloc()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Piotr Bandurski [Sat, 14 Sep 2013 11:54:10 +0000 (13:54 +0200)]
avcodec/bfi: check for malloc failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Piotr Bandurski [Sat, 14 Sep 2013 02:38:15 +0000 (04:38 +0200)]
avcodec/mationpixels: free memory after malloc failures
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sat, 14 Sep 2013 12:11:22 +0000 (12:11 +0000)]
avfilter/avf_avectorscope: improve description
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sat, 14 Sep 2013 10:45:14 +0000 (10:45 +0000)]
avcodec/cdxl: use av_freep()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Piotr Bandurski [Sat, 14 Sep 2013 02:03:11 +0000 (04:03 +0200)]
avcodec/mationpixels: check for malloc failures
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Alexey Balekhov [Sat, 14 Sep 2013 01:51:45 +0000 (03:51 +0200)]
ffserver: allow choosing the pixel format
Fixes Ticket2954
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 13 Sep 2013 22:31:40 +0000 (00:31 +0200)]
avcodec/mpeg12dec: clear mpeg_enc_ctx_allocated when contexts are deallocated
Fixes Ticket2950
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 13 Sep 2013 21:22:44 +0000 (23:22 +0200)]
avcodec/mjpegdec: check for malloc failure of blocks[] and last_nnz[]
Fixes null pointer dereference
Fixes Ticket2947
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 13 Sep 2013 20:38:26 +0000 (20:38 +0000)]
avcodec/g2meet: remove redundant log message
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 12 Sep 2013 18:11:44 +0000 (18:11 +0000)]
avcodec/proresdec2: remove duplicated tables
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 13 Sep 2013 13:47:07 +0000 (13:47 +0000)]
avfilter/video: remove commented out cruft
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Fri, 13 Sep 2013 18:51:41 +0000 (20:51 +0200)]
avutil/pixdesc: dont try to use av_read_image_line() with bayer formats
It has undefined behavior ATM as its not supported.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 13 Sep 2013 18:51:04 +0000 (20:51 +0200)]
avutil/pixdesc: Prevent minor array overread in ff_check_pixfmt_descriptors()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 13 Sep 2013 11:48:36 +0000 (13:48 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
pcm-dvd: Minor leftovers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 13 Sep 2013 11:41:38 +0000 (13:41 +0200)]
Merge commit '
d9cdb7d8d6d828bb5497ea3f0fd7edd2f3f6cc30 '
* commit '
d9cdb7d8d6d828bb5497ea3f0fd7edd2f3f6cc30 ':
pcm-dvd: Support channel configuration changes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Christian Schmidt [Wed, 11 Sep 2013 14:17:13 +0000 (16:17 +0200)]
pcm-dvd: Minor leftovers
Drop a pointless branch in uninit and use the compact copyright.
Christian Schmidt [Wed, 11 Sep 2013 14:12:27 +0000 (16:12 +0200)]
pcm-dvd: Support channel configuration changes
The sample buffering logic does not take into account that the blocksize
could change. Reset the buffer if the channel configuration changes,
since if there are leftover samples, it is most likely a broken or
misconcatenated stream. This could lead to negative numbers for
missing_samples during decoding.
Thanks to Michael Niedermeyer for pointing these out.
Michael Niedermayer [Fri, 13 Sep 2013 09:29:28 +0000 (11:29 +0200)]
avfilter/vf_noise: rename linesize to bytewidth
Its the width in bytes and not the linesize or stride.
This makes the naming more consistent with the rest of the codebase
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 13 Sep 2013 09:24:10 +0000 (11:24 +0200)]
Revert "avfilter/vf_noise: dont corrupt the picture outside width x height"
This reverts commit
51dab60c7b91a21ec280c7d3042aa8350aae048f .
this fixed nothing, and was just the result of assuming that the
variable named linesize was the linesize. Its not, its the width
in bytes which was already correct.
Found-by: durandal_1707
Georg Martius [Fri, 13 Sep 2013 09:31:56 +0000 (11:31 +0200)]
avfilter/vidstabtransform: allow negative zoom.
This is useful in addition to crop=black.
Signed-off-by: Clément Bœsch <clement@stupeflix.com>
Vignesh Venkatasubramanian [Thu, 12 Sep 2013 17:24:43 +0000 (10:24 -0700)]
lavf/matroska: Removing experimental suffix for Opus
Removing the /EXPERIMENTAL suffix for codec id field for Opus. Doing this
as the implementation of embedding Opus in Matroska is complete.
Signed-Off By: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vignesh Venkatasubramanian [Thu, 12 Sep 2013 17:22:36 +0000 (10:22 -0700)]
Adding a line to Changelog about Opus Matroska Support
Next release of ffmpeg will support embedding Opus in Matroska
container. Adding that to the Changelog.
Signed-Off By: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 Sep 2013 20:19:33 +0000 (22:19 +0200)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Set bits_per_raw_sample when reading j2k frames.
libopenjpegdec.c: Correctly scale gray16 output if precision < 16
Use rc_max_rate if no video bit_rate was specified when muxing mxf_d10.
Store the video bit_rate in the context when muxing mxf.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Thu, 12 Sep 2013 16:34:54 +0000 (16:34 +0000)]
avcodec/smacker: use init_get_bits8()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Thu, 12 Sep 2013 15:25:30 +0000 (17:25 +0200)]
avcodec/aacenc: use enum for aac coder.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Wed, 11 Sep 2013 03:24:39 +0000 (20:24 -0700)]
aacenc: use constants to set AAC coder
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Wed, 11 Sep 2013 03:23:32 +0000 (20:23 -0700)]
aacenc: add AAC_CODER_(FAAC|ANMR|etc.) macros
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 Sep 2013 14:34:24 +0000 (16:34 +0200)]
avcodec/aic: fix "warning: comparison of unsigned expression < 0 is always false"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 Sep 2013 14:33:21 +0000 (16:33 +0200)]
avfilter/vf_noise: dont corrupt the picture outside width x height
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Thu, 12 Sep 2013 14:54:10 +0000 (14:54 +0000)]
avfilter/vf_noise: unbreak filter when inline assembly is not present
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Thu, 12 Sep 2013 13:44:32 +0000 (15:44 +0200)]
avcodec/smacker: fix some memleaks
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 Sep 2013 13:41:59 +0000 (15:41 +0200)]
avcodec/smacker: remove check that has become redundant
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 Sep 2013 13:31:12 +0000 (15:31 +0200)]
avcodec/smacker: use the correct field instead of a hardcoded value for the index check in smacker_decode_tree()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 Sep 2013 13:27:17 +0000 (15:27 +0200)]
vformat/smacker: use av_freep() to ensure no stale pointers remain
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sat, 7 Sep 2013 12:13:50 +0000 (12:13 +0000)]
avfilter: various cosmetics
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Thu, 12 Sep 2013 13:12:52 +0000 (15:12 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
matroskaenc: Fix stray pointers left over from av_reallocp_array refactoring
Conflicts:
libavformat/matroskaenc.c
Mostly not merged as the buggy code was no longer part of FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Thu, 12 Sep 2013 07:20:05 +0000 (09:20 +0200)]
MAINTAINERS: move sections from lavc to lavu
Reflect current code organization.
Michael Niedermayer [Thu, 12 Sep 2013 13:02:23 +0000 (15:02 +0200)]
Merge commit '
c0779a67e85df856904ee6fab760c4233d4c2be5 '
* commit '
c0779a67e85df856904ee6fab760c4233d4c2be5 ':
mp3: add .mpa extension
Conflicts:
libavformat/mp3dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 Sep 2013 12:57:08 +0000 (14:57 +0200)]
Merge commit '
e2cd766ca1b9bb2ba72aca5f6ba5d8be15743984 '
* commit '
e2cd766ca1b9bb2ba72aca5f6ba5d8be15743984 ':
configure: Mention that icl does not build both static and shared libs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 Sep 2013 12:39:42 +0000 (14:39 +0200)]
Merge commit '
b1e469885362febce3d9a4678624e44a92f77da9 '
* commit '
b1e469885362febce3d9a4678624e44a92f77da9 ':
g2meet: Allocate cursor buffers large enough to fit the aligned width
See:
3c4c5ca1c194464f51de87534d15602f99bf9759
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 Sep 2013 12:33:25 +0000 (14:33 +0200)]
Merge commit '
0f678c0214dccb355ed8955077a2bea46984fbc8 '
* commit '
0f678c0214dccb355ed8955077a2bea46984fbc8 ':
aic: Validate values read from the bitstream
Conflicts:
libavcodec/aic.c
See:
657875b145c788d29b8e3bf38f79264e657932ae
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 Sep 2013 12:21:54 +0000 (14:21 +0200)]
Merge commit '
17d57848fc14e82f76a65ffb25c90f2f011dc4a0 '
* commit '
17d57848fc14e82f76a65ffb25c90f2f011dc4a0 ':
mpc8: Make sure the first stream exists before parsing the seek table
Conflicts:
libavformat/mpc8.c
See:
69fb605ad5e0f1384ca4d06d38ce0f1b6c8c286d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 Sep 2013 12:10:17 +0000 (14:10 +0200)]
Merge commit '
459f2b393a3f89ed08d10fbceb4738d1429f268e '
* commit '
459f2b393a3f89ed08d10fbceb4738d1429f268e ':
mpc8: Check the seek table size parsed from the bitstream
Conflicts:
libavformat/mpc8.c
See:
b61ba262a1e275f8129b7383d70fe48051b47fcf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 Sep 2013 11:58:01 +0000 (13:58 +0200)]
Merge commit '
0d61f260010707f3028b818e8b24598e1a83d696 '
* commit '
0d61f260010707f3028b818e8b24598e1a83d696 ':
zmbvdec: Check the buffer size for uncompressed data
Conflicts:
libavcodec/zmbv.c
See:
44c23aa1b85d195db6647d24e3b1d3de051790db
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 Sep 2013 11:45:03 +0000 (13:45 +0200)]
Merge commit '
183b9d843a9533774fabd3984a52f3987001acbc '
* commit '
183b9d843a9533774fabd3984a52f3987001acbc ':
ape: Don't allow the seektable to be omitted
See:
e7cb161515fc9fb6d30d1681d64d9ba7ad737a4e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 Sep 2013 11:37:20 +0000 (13:37 +0200)]
Merge commit '
b26742cc308552f242ee2bf93b07a3ff509f4edc '
* commit '
b26742cc308552f242ee2bf93b07a3ff509f4edc ':
shorten: Break out of loop looking for fmt chunk if none is found
See:
5e9a56a0350c518cd4b38845aff49d41a9c952ae
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 Sep 2013 11:30:44 +0000 (13:30 +0200)]
Merge commit '
49568851bf1700e3d9ea9cda29208d0df3c2c38b '
* commit '
49568851bf1700e3d9ea9cda29208d0df3c2c38b ':
shorten: Use a checked bytestream reader for the wave header
Conflicts:
libavcodec/shorten.c
See:
5e9a56a0350c518cd4b38845aff49d41a9c952ae
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Alexandra Khirnova [Thu, 12 Sep 2013 07:49:38 +0000 (09:49 +0200)]
matroskaenc: Fix stray pointers left over from av_reallocp_array refactoring
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Vittorio Giovara [Mon, 9 Sep 2013 14:30:35 +0000 (16:30 +0200)]
mp3: add .mpa extension
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diego Biurrun [Tue, 10 Sep 2013 10:28:19 +0000 (12:28 +0200)]
configure: Mention that icl does not build both static and shared libs
Michael Niedermayer [Thu, 12 Sep 2013 10:57:58 +0000 (12:57 +0200)]
Merge commit '
f3d57dc69145f1b7acb4870da9ce60378190a1fd '
* commit '
f3d57dc69145f1b7acb4870da9ce60378190a1fd ':
smacker: Free memory properly if the init function fails
Conflicts:
libavcodec/smacker.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 Sep 2013 10:45:29 +0000 (12:45 +0200)]
Merge commit '
0679cec6e8802643bbe6d5f68ca1110a7d3171da '
* commit '
0679cec6e8802643bbe6d5f68ca1110a7d3171da ':
smacker: Make sure we don't fill in huffman codes out of range
Conflicts:
libavcodec/smacker.c
See:
1285baaab550e3e761590ef6dfb1d9bd9d1332e4
the added test is redundant but will be used after future refactoring
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 Sep 2013 09:55:08 +0000 (11:55 +0200)]
Merge commit '
d002fce24a7206e95f9492031f45adc35711e183 '
* commit '
d002fce24a7206e95f9492031f45adc35711e183 ':
smacker: Check malloc return values
Conflicts:
libavcodec/smacker.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 Sep 2013 09:38:55 +0000 (11:38 +0200)]
Merge commit '
710b0e27025948b7511821c2f888ff2d74a59e14 '
* commit '
710b0e27025948b7511821c2f888ff2d74a59e14 ':
smacker: Avoid integer overflow when allocating packets
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 Sep 2013 09:26:11 +0000 (11:26 +0200)]
Merge commit '
8d928023f953a28692ba27071a448259134b103b '
* commit '
8d928023f953a28692ba27071a448259134b103b ':
smacker: Don't return packets in unallocated streams
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 Sep 2013 09:17:21 +0000 (11:17 +0200)]
Merge commit '
48d6556dd46d4f4fac10d0f4a819e314887cd50e '
* commit '
48d6556dd46d4f4fac10d0f4a819e314887cd50e ':
dsicin: Add some basic sanity checks for fields read from the file
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 Sep 2013 09:09:04 +0000 (11:09 +0200)]
Merge commit '
5045f6bdfabfa5d3374756d2c23f762fb042acae '
* commit '
5045f6bdfabfa5d3374756d2c23f762fb042acae ':
configure: Fix wrong reference to user support mailing list
Conflicts:
configure
No change as the reference was not wrong in ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Wed, 11 Sep 2013 20:40:12 +0000 (23:40 +0300)]
g2meet: Allocate cursor buffers large enough to fit the aligned width
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 11 Sep 2013 20:25:04 +0000 (23:25 +0300)]
aic: Validate values read from the bitstream
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 11 Sep 2013 19:53:15 +0000 (22:53 +0300)]
mpc8: Make sure the first stream exists before parsing the seek table
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 11 Sep 2013 19:47:06 +0000 (22:47 +0300)]
mpc8: Check the seek table size parsed from the bitstream
Limit the size to INT_MAX/2 (for simplicity) to be sure that
size + FF_INPUT_BUFFER_PADDING_SIZE won't overflow.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Sun, 11 Nov 2012 17:08:39 +0000 (18:08 +0100)]
zmbvdec: Check the buffer size for uncompressed data
Also don't pointlessly set the buffer size to 1 after copying
one packet.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 11 Sep 2013 19:29:33 +0000 (22:29 +0300)]
ape: Don't allow the seektable to be omitted
The seektable is required for filling in ape->frames[i].pos
further down.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 11 Sep 2013 19:19:28 +0000 (22:19 +0300)]
shorten: Break out of loop looking for fmt chunk if none is found
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 11 Sep 2013 19:17:13 +0000 (22:17 +0300)]
shorten: Use a checked bytestream reader for the wave header
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Carl Eugen Hoyos [Thu, 12 Sep 2013 07:23:32 +0000 (09:23 +0200)]
Set bits_per_raw_sample when reading j2k frames.
Michael Bradshaw [Thu, 12 Sep 2013 07:21:51 +0000 (09:21 +0200)]
libopenjpegdec.c: Correctly scale gray16 output if precision < 16
Fixes ticket #2943.
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Carl Eugen Hoyos [Mon, 9 Sep 2013 08:03:14 +0000 (10:03 +0200)]
Use rc_max_rate if no video bit_rate was specified when muxing mxf_d10.
Fixes ticket #2945.
Reviewed-by: Matthieu Bouron
Carl Eugen Hoyos [Mon, 9 Sep 2013 08:02:12 +0000 (10:02 +0200)]
Store the video bit_rate in the context when muxing mxf.
This will allow using rc_max_rate if no bit_rate is specified (on remuxing).
Reviewed-by: Matthieu Bouron
James Almer [Mon, 9 Sep 2013 23:16:40 +0000 (20:16 -0300)]
lavu/sha512: Fully unroll the transform function loops
crypto_bench SHA-512 results using an AMD Athlon X2 7750+, mingw32-w64 GCC 4.7.3 x86_64
Before:
lavu SHA-512 size:
1048576 runs: 1024 time: 12.737 +- 0.147
After:
lavu SHA-512 size:
1048576 runs: 1024 time: 11.670 +- 0.173
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Mon, 9 Sep 2013 23:16:39 +0000 (20:16 -0300)]
lavu/sha: Fully unroll the transform function loops
crypto_bench SHA-1 and SHA-256 results using an AMD Athlon X2 7750+, mingw32-w64 GCC 4.7.3 x86_64
Before:
lavu SHA-1 size:
1048576 runs: 1024 time: 9.012 +- 0.162
lavu SHA-256 size:
1048576 runs: 1024 time: 19.625 +- 0.173
After:
lavu SHA-1 size:
1048576 runs: 1024 time: 7.948 +- 0.154
lavu SHA-256 size:
1048576 runs: 1024 time: 17.841 +- 0.170
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Wed, 11 Sep 2013 12:55:18 +0000 (15:55 +0300)]
smacker: Free memory properly if the init function fails
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 11 Sep 2013 12:54:20 +0000 (15:54 +0300)]
smacker: Make sure we don't fill in huffman codes out of range
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 11 Sep 2013 12:35:19 +0000 (15:35 +0300)]
smacker: Check malloc return values
Also try to free local allocations on errors.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 11 Sep 2013 12:25:13 +0000 (15:25 +0300)]
smacker: Avoid integer overflow when allocating packets
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 11 Sep 2013 12:20:01 +0000 (15:20 +0300)]
smacker: Don't return packets in unallocated streams
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 11 Sep 2013 12:13:48 +0000 (15:13 +0300)]
dsicin: Add some basic sanity checks for fields read from the file
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Paul B Mahol [Wed, 11 Sep 2013 13:29:12 +0000 (13:29 +0000)]
avfilter: remove redundant use of AV_NE() macro
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 11 Sep 2013 11:30:15 +0000 (11:30 +0000)]
avformat/nutdec: check for allocation failures
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 11 Sep 2013 14:56:46 +0000 (14:56 +0000)]
avfilter/vf_traspose: move switch out of loop
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Dylan Alex Simon [Tue, 13 Aug 2013 15:33:51 +0000 (11:33 -0400)]
avcodec: add const qualifier to avcodec_find_best_pix_fmt2 args
avcodec_find_best_pix_fmt2 does not modify its first argument so may be
marked const. This avoids a warning when passing in AVCodec.pix_fmts.
Signed-off-by: Dylan Simon <dylan@dylex.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Tue, 10 Sep 2013 10:42:10 +0000 (12:42 +0200)]
configure: Fix wrong reference to user support mailing list
Michael Niedermayer [Wed, 11 Sep 2013 11:34:25 +0000 (13:34 +0200)]
avformat/utils: use av_realloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 11 Sep 2013 11:34:25 +0000 (13:34 +0200)]
avformat/mxfdec: use av_realloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 11 Sep 2013 11:34:25 +0000 (13:34 +0200)]
avformat/matroskaenc: use av_realloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 11 Sep 2013 11:34:25 +0000 (13:34 +0200)]
avformat/matroskadec: use av_realloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 11 Sep 2013 11:19:51 +0000 (13:19 +0200)]
avformat/matroskaenc: use av_freep() to avoid leaving stale pointers
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 11 Sep 2013 11:18:17 +0000 (13:18 +0200)]
avformat/asfenc: use av_freep() for extra saftey
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 11 Sep 2013 11:16:03 +0000 (13:16 +0200)]
avformat/gxfenc: Clear nb_fields on array deallocation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 11 Sep 2013 11:14:12 +0000 (13:14 +0200)]
avformat/gxfenc: Check and propagate return code from gxf_write_map_packet()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Wed, 11 Sep 2013 10:23:03 +0000 (10:23 +0000)]
avformat/smacker: check avformat_new_stream() return value
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 11 Sep 2013 10:14:01 +0000 (10:14 +0000)]
avformat/libnut: check avformat_new_stream() return value
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 11 Sep 2013 10:10:55 +0000 (10:10 +0000)]
avformat/ffmetadec: return meaningful error codes
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 11 Sep 2013 09:59:40 +0000 (09:59 +0000)]
avformat/sierravmd: check for memory allocation failures
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 10 Sep 2013 19:57:54 +0000 (19:57 +0000)]
avformat/flic: check for memory allocation failures
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Wed, 11 Sep 2013 10:50:55 +0000 (12:50 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Drop pointless directory name prefixes from #includes in the current dir
Merged-by: Michael Niedermayer <michaelni@gmx.at>