virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Code Issues Releases Activity
54,164 Commits 37 Branches 400 Tags 463 MiB
69d0a2922f
Commit Graph

54164 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
78d2d1e027 postprocess_template: put rsp on the clobber list to prevent gcc from using it in "q" 
Fixes Ticket2675

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-16 18:21:39 +02:00
Kostya Shishkov
ee16a0ced0 smacker: check frame size validity 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-06-16 15:57:31 +02:00
Kostya Shishkov
58c95448e4 smacker: pad the extradata allocation 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-06-16 15:57:31 +02:00
Kostya Shishkov
bbb2945f2d smacker: check the return value of smacker_decode_tree 
Also prevent a memory leak.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-06-16 15:56:50 +02:00
Kostya Shishkov
f52edef301 smacker: fix an off by one in huff.length computation 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-06-16 15:55:53 +02:00
Michael Niedermayer
3b86174290 avcodec/jpeg2000dec: move bpno check to a earlier place 
This prevents additional integer overflows

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-16 15:27:39 +02:00
Janne Grunau
985f34b756 utils: fix avcodec_flush_buffers pre-reference counting compatibility 
The to_free AVframe must be freed just like the other ones.
Indeed, the calling application may expect all frames to be
released.

(This regression caused use-after-free in VLC with hwaccel.)

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-06-16 15:10:58 +02:00
Luca Barbato
df9f22d42b avf: move url utility functions in a separate file 2013-06-16 15:01:39 +02:00
Luca Barbato
12db891dcd avf: move ff_write_chained to mux.c 2013-06-16 14:41:07 +02:00
Luca Barbato
508998f7d5 avf: move riff tags accessors where they belong 2013-06-16 14:41:07 +02:00
Luca Barbato
ec7c51c786 avf: move ff_http_match_no_proxy to network 
It is only used by network protocols.
 2013-06-16 14:41:00 +02:00
Luca Barbato
afc8685395 avf: split off format register and lookup function 2013-06-16 14:00:40 +02:00
James Almer
3e17eec607 lavu/adler32: Fix doxy group definition, take two 
The description if for the function, not the group.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-16 12:50:00 +02:00
James Almer
4a0d603072 lavu/hash: Add support for RIPEMD 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-16 12:49:39 +02:00
Hendrik Leppkes
8962da9ec3 rawdec: allocate a buffer in the appropriate size in the copy case. 
Otherwise the created buffer can be smaller than buf_size, which results
in buffer overreads if the original image has extra padding on every line.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-16 09:50:16 +02:00
Luca Barbato
f80b60ad59 bitstream: forward error values and drop few abort() 2013-06-16 09:30:26 +02:00
Luca Barbato
f776899a17 bitstream: K&R formatting cosmetics 2013-06-16 09:30:25 +02:00
Michael Niedermayer
359af6a7c7 Merge branch 'crypto' of https://github.com/jamrial/FFmpeg 
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-16 01:07:24 +02:00
James Almer
99b8cd0c81 lavu: Add RIPEMD hashing 
Includes RIPEMD-128, RIPEMD-160, RIPEMD-256 and RIPEMD-320

Signed-off-by: James Almer <jamrial@gmail.com>
 2013-06-15 18:54:01 -03:00
James Almer
1bb005ce54 lavf/md5enc: Use AV_HASH_MAX_SIZE 
Also increase the buffer size in write_trailer(), since 128
is not enough anymore

Signed-off-by: James Almer <jamrial@gmail.com>
 2013-06-15 18:50:11 -03:00
James Almer
b6249acae6 lavu/hash: Add support for SHA-2 512 
Signed-off-by: James Almer <jamrial@gmail.com>
 2013-06-15 18:49:12 -03:00
Paul B Mahol
8a79a009f9 lavu/utils: silence warnings about incompatible pointer types 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-15 21:47:45 +00:00
Andrey Utkin
194fde3834 Document "cache" protocol 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-15 23:26:18 +02:00
Luca Barbato
9e80eda26d h264_mp4toannexb_bsf: return a padded buffer 
The code using the returned buffer might expect it to be
FF_INPUT_BUFFER_PADDING_SIZE padded as any other avpacket.
 2013-06-15 16:14:45 +02:00
Luca Barbato
8d929afd25 h264_mp4toannexb_bsf: factor out extradata parsing 2013-06-15 16:14:33 +02:00
Michael Niedermayer
6c4516d041 avcodec/vc1dec: Check source picture availability in vc1_mc_4mv_chroma4() 
Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-15 13:11:35 +02:00
Michael Niedermayer
1ba196a10d avutil/utils: check and warn about llrint() brokenness 
Such broken llrint() exist for example on netbsd

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-15 11:22:22 +02:00
Luca Barbato
5d21ca4559 h264_mp4toannexb_bsf: K&R formatting cosmetics 2013-06-15 09:11:13 +02:00
James Almer
c4f932f4d7 lavu/md5: Add doxy 
Mostly a copy&paste from other hash functions, with changes
where required.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-15 02:22:39 +02:00
James Almer
321906d341 lavu/crc: Fix doxy group definition 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-15 02:22:16 +02:00
James Almer
79d9ed4a43 lavu/adler32: Fix doxy group definition 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-15 02:22:00 +02:00
Mark Visser
0defc77e9d added start_number parameter to drawtext to permit an offset to n/frame_num var 2013-06-14 17:05:19 -04:00
Michael Niedermayer
3c4c5ca1c1 avcodec/g2meet: Check monochrome cursor width 
Fixes out of array write

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-14 21:14:31 +02:00
Michael Niedermayer
69e4d8e6a4 avcodec/jpeg2000dec: check len before parsing header 
Fixes out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-14 19:34:00 +02:00
Michael Niedermayer
5deb96c564 avcodec/jpeg2000dec: Check Psot 
Fixes out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-14 19:34:00 +02:00
Paul B Mahol
a75d2a6505 apetag: do not require seekable output 
Also don't write empty tags.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-14 17:07:36 +00:00
Michael Niedermayer
7fff3df6b2 avcodec_encode_audio2: fix memleak on last padded frame 
Regression introduced by 799f57ac96

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-14 15:21:23 +02:00
Peter Ross
d891d354c5 mpegts: Enable muxing of SMPTE KLV metadata 
Muxer code rebased/split out by: Jeff Blackburne <jblackburne@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-14 13:41:40 +02:00
Hendrik Leppkes
59d3c24e28 vc1_parser: fix parsing of the frame headers in interlaced streams 
first_pic_header_flag needs to be set to allow the parsing code to change
some stream parameters, and not error out.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-14 12:03:44 +02:00
Clément Bœsch
147adf2c4f lavfi/spp: fix description. 2013-06-14 06:53:52 +02:00
Timothy Gu
6fe419bf73 doc/general: Make the license status of the Android libraries clearer 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-14 03:58:39 +02:00
Jean Delvare
cef42ded8d drawbox: Respect thickness parameter 
The drawbox video filter is drawing lines one pixel thinner than
requested. The default thickness is 4 pixel but in fact the lines
drawn by default are only 3 pixel wide.

Change the comparisons in the code to fix this off-by-one bug. Also
change the default thickness from 4 to 3 to minimize the unexpected
changes from the user's perspective.

As I was already touching these lines, I also removed the "maximum" in
the thickness parameter description, as I don't think it was adding
any value and I even found it confusing.

Reviewed-by: Andrey Utkin <andrey.krieger.utkin@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-14 03:52:32 +02:00
Michael Niedermayer
e850a064ce jpeg2000dec: Check compno in get_coc() 
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-14 01:55:43 +02:00
Clément Bœsch
852f74bd85 lavfi/mp: remove mp=spp. 
The filter was ported to a native libavfilter filter.
 2013-06-14 01:27:22 +02:00
Clément Bœsch
a2c547ffec lavfi: add spp filter. 2013-06-14 01:27:22 +02:00
Michael Niedermayer
129edcb50f jpeg2000dec: dont set ncomponents to an invalid value 
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-14 00:36:45 +02:00
Paul B Mahol
ff0bdf9375 lavc: copy AVCodecContext for threads 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-13 21:49:18 +00:00
Michael Niedermayer
c112e36d41 flacdec: Fix used AVCodecContext 
Fixes out of array writes with multiple threads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-13 22:31:54 +02:00
Michael Niedermayer
fa125c5e82 avutil/timestamp: remove "" 
This may fix an error with C++

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-13 14:57:00 +02:00
Michael Niedermayer
a9821bdafb Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  4xm: check bitstream_size boundary before using it

Conflicts:
	libavcodec/4xm.c

See: 9c661e95

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-13 14:51:59 +02:00