Michael Niedermayer
84f77f8423
Merge commit 'ec7c51c7868d3ccc66b5cc38bf126258b94f086c'
...
* commit 'ec7c51c7868d3ccc66b5cc38bf126258b94f086c':
avf: move ff_http_match_no_proxy to network
Conflicts:
libavformat/internal.h
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
4a522eff00
Merge commit 'afc8685395e775fe0f2a1698b683aea4afd124af'
...
* commit 'afc8685395e775fe0f2a1698b683aea4afd124af':
avf: split off format register and lookup function
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
301522f521
Merge commit 'f80b60ad59945dae32bb26a4e239ed94b0e92fa3'
...
* commit 'f80b60ad59945dae32bb26a4e239ed94b0e92fa3':
bitstream: forward error values and drop few abort()
Conflicts:
libavcodec/bitstream.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
9265bae356
Merge commit 'f776899a17dce32ad7fb9231d98f15558f37cc3f'
...
* commit 'f776899a17dce32ad7fb9231d98f15558f37cc3f':
bitstream: K&R formatting cosmetics
Conflicts:
libavcodec/bitstream.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
9f91e7deec
Merge commit '9e80eda26d06c7c48dbec5dfe643c857c62c0ee7'
...
* commit '9e80eda26d06c7c48dbec5dfe643c857c62c0ee7':
h264_mp4toannexb_bsf: return a padded buffer
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
0a5d22a195
Merge commit '8d929afd256069aa881f2bf58ef9f0ffce2d6b7e'
...
* commit '8d929afd256069aa881f2bf58ef9f0ffce2d6b7e':
h264_mp4toannexb_bsf: factor out extradata parsing
Conflicts:
libavcodec/h264_mp4toannexb_bsf.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
46a5003a4a
Merge commit '5d21ca45591bb1c1d2265f8ed972d18c563f145e'
...
* commit '5d21ca45591bb1c1d2265f8ed972d18c563f145e':
h264_mp4toannexb_bsf: K&R formatting cosmetics
Conflicts:
libavcodec/h264_mp4toannexb_bsf.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Paul B Mahol
e997afdfc6
lavf: show APIC for tta files too
...
Fixes #2676 .
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Paul B Mahol
9ea7ff7955
tta: read ape tags last
...
Otherwise, cover art will create video stream with index 0.
Fixes #2677 .
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
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>
12 years ago
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>
12 years ago
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>
12 years ago
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>
12 years ago
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>
12 years ago
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>
12 years ago
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>
12 years ago
Luca Barbato
df9f22d42b
avf: move url utility functions in a separate file
12 years ago
Luca Barbato
12db891dcd
avf: move ff_write_chained to mux.c
12 years ago
Luca Barbato
508998f7d5
avf: move riff tags accessors where they belong
12 years ago
Luca Barbato
ec7c51c786
avf: move ff_http_match_no_proxy to network
...
It is only used by network protocols.
12 years ago
Luca Barbato
afc8685395
avf: split off format register and lookup function
12 years ago
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>
12 years ago
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>
12 years ago
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>
12 years ago
Luca Barbato
f80b60ad59
bitstream: forward error values and drop few abort()
12 years ago
Luca Barbato
f776899a17
bitstream: K&R formatting cosmetics
12 years ago
Michael Niedermayer
359af6a7c7
Merge branch 'crypto' of https://github.com/jamrial/FFmpeg
...
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
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>
12 years ago
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>
12 years ago
James Almer
b6249acae6
lavu/hash: Add support for SHA-2 512
...
Signed-off-by: James Almer <jamrial@gmail.com>
12 years ago
Paul B Mahol
8a79a009f9
lavu/utils: silence warnings about incompatible pointer types
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Andrey Utkin
194fde3834
Document "cache" protocol
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
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.
12 years ago
Luca Barbato
8d929afd25
h264_mp4toannexb_bsf: factor out extradata parsing
12 years ago
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>
12 years ago
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>
12 years ago
Luca Barbato
5d21ca4559
h264_mp4toannexb_bsf: K&R formatting cosmetics
12 years ago
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>
12 years ago
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>
12 years ago
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>
12 years ago
Mark Visser
0defc77e9d
added start_number parameter to drawtext to permit an offset to n/frame_num var
12 years ago
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>
12 years ago
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>
12 years ago
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>
12 years ago
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>
12 years ago
Michael Niedermayer
7fff3df6b2
avcodec_encode_audio2: fix memleak on last padded frame
...
Regression introduced by 799f57ac96
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
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>
12 years ago
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>
12 years ago
Clément Bœsch
147adf2c4f
lavfi/spp: fix description.
12 years ago
Timothy Gu
6fe419bf73
doc/general: Make the license status of the Android libraries clearer
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago