Michael Niedermayer
33cf70a8b8
Merge commit '8d928023f953a28692ba27071a448259134b103b'
...
* commit '8d928023f953a28692ba27071a448259134b103b':
smacker: Don't return packets in unallocated streams
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
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>
11 years ago
Michael Niedermayer
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>
11 years ago
Martin Storsjö
b1e4698853
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>
11 years ago
Martin Storsjö
0f678c0214
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>
11 years ago
Martin Storsjö
17d57848fc
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>
11 years ago
Martin Storsjö
459f2b393a
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>
11 years ago
Michael Niedermayer
0d61f26001
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>
11 years ago
Martin Storsjö
183b9d843a
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>
11 years ago
Martin Storsjö
b26742cc30
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>
11 years ago
Martin Storsjö
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>
11 years ago
Carl Eugen Hoyos
f99f7f4025
Set bits_per_raw_sample when reading j2k frames.
11 years ago
Michael Bradshaw
7412a4a48f
libopenjpegdec.c: Correctly scale gray16 output if precision < 16
...
Fixes ticket #2943 .
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
11 years ago
Carl Eugen Hoyos
d73565d5dd
Use rc_max_rate if no video bit_rate was specified when muxing mxf_d10.
...
Fixes ticket #2945 .
Reviewed-by: Matthieu Bouron
11 years ago
Carl Eugen Hoyos
52cf08b4c8
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
11 years ago
James Almer
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>
11 years ago
James Almer
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>
11 years ago
Martin Storsjö
f3d57dc691
smacker: Free memory properly if the init function fails
...
Signed-off-by: Martin Storsjö <martin@martin.st>
11 years ago
Martin Storsjö
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>
11 years ago
Martin Storsjö
d002fce24a
smacker: Check malloc return values
...
Also try to free local allocations on errors.
Signed-off-by: Martin Storsjö <martin@martin.st>
11 years ago
Martin Storsjö
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>
11 years ago
Martin Storsjö
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>
11 years ago
Martin Storsjö
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>
11 years ago
Paul B Mahol
a8e00cf926
avfilter: remove redundant use of AV_NE() macro
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Paul B Mahol
269845db86
avformat/nutdec: check for allocation failures
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Paul B Mahol
99a283331c
avfilter/vf_traspose: move switch out of loop
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Dylan Alex Simon
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>
11 years ago
Diego Biurrun
5045f6bdfa
configure: Fix wrong reference to user support mailing list
11 years ago
Michael Niedermayer
2a1c24a267
avformat/utils: use av_realloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
c5714097eb
avformat/mxfdec: use av_realloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
9bca8e5341
avformat/matroskaenc: use av_realloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
e529082369
avformat/matroskadec: use av_realloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
b5b34c1983
avformat/matroskaenc: use av_freep() to avoid leaving stale pointers
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
2175f76894
avformat/asfenc: use av_freep() for extra saftey
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
2832a82e17
avformat/gxfenc: Clear nb_fields on array deallocation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
a6ca08f1af
avformat/gxfenc: Check and propagate return code from gxf_write_map_packet()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Paul B Mahol
9e505485f3
avformat/smacker: check avformat_new_stream() return value
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Paul B Mahol
848ad8db22
avformat/libnut: check avformat_new_stream() return value
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Paul B Mahol
f2e614e7e9
avformat/ffmetadec: return meaningful error codes
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Paul B Mahol
60caa3d8bc
avformat/sierravmd: check for memory allocation failures
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Paul B Mahol
00e1bf8a58
avformat/flic: check for memory allocation failures
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Michael Niedermayer
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>
11 years ago
Michael Niedermayer
c45e9097d8
Merge commit 'ec17d1aa8b833d49d8fc479e44e9e22858aa486c'
...
* commit 'ec17d1aa8b833d49d8fc479e44e9e22858aa486c':
doc: Drop VDPAU from list of supported codecs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
24da9eb25d
Merge commit 'c58f4069e1d5b5804c669b691510e1b8fabb67fc'
...
* commit 'c58f4069e1d5b5804c669b691510e1b8fabb67fc':
fate.sh: Run git-clone quietly
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
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>
11 years ago
Michael Niedermayer
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>
11 years ago
Michael Niedermayer
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>
11 years ago
Michael Niedermayer
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>
11 years ago
Michael Niedermayer
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>
11 years ago
Michael Niedermayer
64b6279d14
avcodec/mjpegdec: Support >8bpc color mjpeg
...
Fixes Ticket2939
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago