a44d35d90f
Merge commit '49568851bf1700e3d9ea9cda29208d0df3c2c38b'
...
* commit '49568851bf1700e3d9ea9cda29208d0df3c2c38b':
shorten: Use a checked bytestream reader for the wave header
Conflicts:
libavcodec/shorten.c
See: 5e9a56a035michaelni@gmx.at >
2013-09-12 13:31:59 +02:00
af539319af
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 >
2013-09-12 12:57:58 +02:00
f8932d9902
Merge commit '0679cec6e8802643bbe6d5f68ca1110a7d3171da'
...
* commit '0679cec6e8802643bbe6d5f68ca1110a7d3171da':
smacker: Make sure we don't fill in huffman codes out of range
Conflicts:
libavcodec/smacker.c
See: 1285baaab5michaelni@gmx.at >
2013-09-12 12:51:07 +02:00
d510d70df0
Merge commit 'd002fce24a7206e95f9492031f45adc35711e183'
...
* commit 'd002fce24a7206e95f9492031f45adc35711e183':
smacker: Check malloc return values
Conflicts:
libavcodec/smacker.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-12 11:55:08 +02:00
c16cd55593
Merge commit '710b0e27025948b7511821c2f888ff2d74a59e14'
...
* commit '710b0e27025948b7511821c2f888ff2d74a59e14':
smacker: Avoid integer overflow when allocating packets
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-12 11:39:18 +02:00
33cf70a8b8
Merge commit '8d928023f953a28692ba27071a448259134b103b'
...
* commit '8d928023f953a28692ba27071a448259134b103b':
smacker: Don't return packets in unallocated streams
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-12 11:26:17 +02:00
7e88dbe935
Merge commit '48d6556dd46d4f4fac10d0f4a819e314887cd50e'
...
* commit '48d6556dd46d4f4fac10d0f4a819e314887cd50e':
dsicin: Add some basic sanity checks for fields read from the file
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-12 11:19:38 +02:00
ae77f06c69
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 >
2013-09-12 11:10:46 +02:00
49568851bf
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 >
2013-09-12 10:52:42 +03:00
bbcaf25d4d
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 >
2013-09-11 21:55:59 +02:00
7e4fe5162a
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 >
2013-09-11 21:55:59 +02:00
f3d57dc691
smacker: Free memory properly if the init function fails
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2013-09-11 20:20:50 +03:00
0679cec6e8
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 >
2013-09-11 20:20:45 +03:00
d002fce24a
smacker: Check malloc return values
...
Also try to free local allocations on errors.
Signed-off-by: Martin Storsjö <martin@martin.st >
2013-09-11 20:20:28 +03:00
710b0e2702
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 >
2013-09-11 20:19:43 +03:00
8d928023f9
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 >
2013-09-11 20:19:12 +03:00
48d6556dd4
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 >
2013-09-11 20:18:55 +03:00
a8e00cf926
avfilter: remove redundant use of AV_NE() macro
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-09-11 15:05:21 +00:00
269845db86
avformat/nutdec: check for allocation failures
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-09-11 15:04:08 +00:00
99a283331c
avfilter/vf_traspose: move switch out of loop
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-09-11 15:02:08 +00:00
38155b47fd
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 >
2013-09-11 16:54:02 +02:00
5045f6bdfa
configure: Fix wrong reference to user support mailing list
2013-09-11 14:49:56 +02:00
2a1c24a267
avformat/utils: use av_realloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-11 13:38:53 +02:00
c5714097eb
avformat/mxfdec: use av_realloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-11 13:37:31 +02:00
9bca8e5341
avformat/matroskaenc: use av_realloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-11 13:36:11 +02:00
e529082369
avformat/matroskadec: use av_realloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-11 13:34:25 +02:00
b5b34c1983
avformat/matroskaenc: use av_freep() to avoid leaving stale pointers
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-11 13:28:41 +02:00
2175f76894
avformat/asfenc: use av_freep() for extra saftey
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-11 13:21:11 +02:00
2832a82e17
avformat/gxfenc: Clear nb_fields on array deallocation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-11 13:21:11 +02:00
a6ca08f1af
avformat/gxfenc: Check and propagate return code from gxf_write_map_packet()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-11 13:21:11 +02:00
9e505485f3
avformat/smacker: check avformat_new_stream() return value
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-09-11 11:12:35 +00:00
848ad8db22
avformat/libnut: check avformat_new_stream() return value
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-09-11 11:06:45 +00:00
f2e614e7e9
avformat/ffmetadec: return meaningful error codes
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-09-11 11:06:44 +00:00
60caa3d8bc
avformat/sierravmd: check for memory allocation failures
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-09-11 11:06:44 +00:00
00e1bf8a58
avformat/flic: check for memory allocation failures
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-09-11 11:06:44 +00:00
803445e02c
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 >
2013-09-11 12:51:01 +02:00
c45e9097d8
Merge commit 'ec17d1aa8b833d49d8fc479e44e9e22858aa486c'
...
* commit 'ec17d1aa8b833d49d8fc479e44e9e22858aa486c':
doc: Drop VDPAU from list of supported codecs
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-11 12:42:11 +02:00
24da9eb25d
Merge commit 'c58f4069e1d5b5804c669b691510e1b8fabb67fc'
...
* commit 'c58f4069e1d5b5804c669b691510e1b8fabb67fc':
fate.sh: Run git-clone quietly
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-11 12:31:51 +02:00
8c9d6ee4f2
avformat/utils: functions that add entries should not destroy the whole list on failure
...
The caller does not expect this, and in case of adding new streams would then
not even be able to deallocate them anymore.
This reverts a hunk from "avformat: Use av_reallocp_array() where suitable"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-11 12:21:21 +02:00
5ca39a0b89
avformat/mxfdec: functions that add entries should not destroy the whole list on failure
...
The caller does not expect this and there are variables left that index to otherwise
deallocated data.
This reverts a hunk from "avformat: Use av_reallocp_array() where suitable"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-11 12:19:17 +02:00
c9367c0709
avformat/matroskaenc: functions that add entries should not destroy the whole list on failure
...
This reverts a hunk from "avformat: Use av_reallocp_array() where suitable"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-11 12:16:21 +02:00
32805f8521
avformat/matroskadec: ebml_parse_elem() should not deallocate priorly existing lists on failure
...
This reverts a hunk from "avformat: Use av_reallocp_array() where suitable"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-11 12:15:08 +02:00
cbe47b1e84
Merge commit 'f369b9356c4606cd4d713d60f7db5de119d901fa'
...
* commit 'f369b9356c4606cd4d713d60f7db5de119d901fa':
avformat: Use av_reallocp_array() where suitable
Conflicts:
libavformat/asfenc.c
libavformat/gxfenc.c
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-11 11:23:40 +02:00
64b6279d14
avcodec/mjpegdec: Support >8bpc color mjpeg
...
Fixes Ticket2939
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-11 02:45:17 +02:00
7bc9fb8cde
avcodec/utils: add 16bit planar YUV formats to avcodec_align_dimensions2()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-11 02:45:17 +02:00
ae12d65538
lavcodec: Adding support for End Trimming in Opus encoder
...
Adds the end trimming value (duration to be trimmed from the end
of the file due to padding) to the packet's side data. This is
then made use by the muxer to put the value in the container.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-11 01:03:07 +02:00
7b0a839b0b
opus/matroska: Adding support for End Trimming in demuxer/decoder
...
Implementing support for end trimming Opus in Matroska by making
use of the DiscardPadding value from the container and discarding
the samples accordingly.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-10 23:11:15 +02:00
889bc79b5f
lavc/utils: Add support for discarding samples from the end
...
Adding support for discarding samples from the end based on the value in
AV_PKT_DATA_SKIP_SAMPLES side data's bytes 5-8.
Signed-off By: Vignesh Venkatasubramanian <vigneshv@google.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-10 22:53:21 +02:00
bf5ceeffc3
avfilter/vf_psnr: >8 bit planar support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-09-10 16:45:48 +00:00
83165e39fe
doc: Rename avtools-common-opts to fftools-common opts
...
Signed-off-by: Timothy Gu <timothygu99@gmail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-10 18:04:03 +02:00
