]>
git.sesse.net Git - ffmpeg/log
Carl Eugen Hoyos [Mon, 17 Jun 2013 22:21:09 +0000 (00:21 +0200)]
vaapi: return early from ff_vaapi_render_picture() without picture
Fixes an assertion when called on uninitialized frame. Spotted after
seeking in vlc.
Fixes ticket #2461.
Tested-by: Timo
Reviewed-by: Joakim Plate
Alexander Strasser [Sun, 16 Jun 2013 19:44:02 +0000 (21:44 +0200)]
lavfi/src_movie: Use movie_common_init instead individual wrappers
Makes it easier to understand that there is no difference in init
callback for movie and amovie. Also saves a few lines of code.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Alexander Strasser [Sun, 16 Jun 2013 18:31:08 +0000 (20:31 +0200)]
lavfi/src_movie: Check pointer is not NULL before deref
Also do not check against empty string, the lower levels should
be able to deal with it.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Matthew Heaney [Wed, 12 Jun 2013 19:46:16 +0000 (12:46 -0700)]
lavf: add WebVTT muxer.
This revision creates a WebVTT muxer, that outputs files having the
format described in the following specification:
http://dev.w3.org/html5/webvtt/
Michael Niedermayer [Mon, 17 Jun 2013 20:03:36 +0000 (22:03 +0200)]
mmsh: dont close context on seeking failure
Fixes Ticket2581
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Jun 2013 19:34:52 +0000 (21:34 +0200)]
mmsh/mmsh_close: use ffurl_closep()
avoid using freed pointers
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Jun 2013 19:31:07 +0000 (21:31 +0200)]
mmsh/mmsh_close: use av_freep()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Jun 2013 01:17:19 +0000 (03:17 +0200)]
jpeg2000dec: make cblk->length(inc)/data use consistent
Fixes Ticket2612
Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Mon, 17 Jun 2013 15:03:15 +0000 (17:03 +0200)]
lavf/http: remove Mozilla/5.0 from user agent.
It is notably known to break playback on http streaming servers who use
the user agent to guess if it's a browser (to display a summary) or a
player (to stream the audio data).
This reverts
1fabd95 .
Fixes Ticket #2663.
Marton Balint [Sat, 15 Jun 2013 16:40:44 +0000 (18:40 +0200)]
ffplay: remove remains of the old audio and video clock VideoState variables
The unified clock state holds this information now.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 15 Jun 2013 16:26:22 +0000 (18:26 +0200)]
ffplay: fix missed conversion of video_current_pts to vidclk.pts in subtitles
Fixes regression with subtitles introduced in
f2175a6 .
Fixes ticket #2666.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Tue, 4 Jun 2013 21:23:09 +0000 (23:23 +0200)]
ffplay: cast vp->height to int64 in buffer size check
Fixes Coverity CID
1026769 and
1026756 .
Signed-off-by: Marton Balint <cus@passwd.hu>
Michael Niedermayer [Sun, 16 Jun 2013 23:04:33 +0000 (01:04 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
smacker: check frame size validity
Conflicts:
libavformat/smacker.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Jun 2013 22:44:32 +0000 (00:44 +0200)]
Merge commit '
58c95448e42d34910b939363949ba1a92c06b0b0 '
* commit '
58c95448e42d34910b939363949ba1a92c06b0b0 ':
smacker: pad the extradata allocation
Conflicts:
libavformat/smacker.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Jun 2013 22:36:25 +0000 (00:36 +0200)]
Merge commit '
bbb2945f2dfbc2306c1655bf7eb6e220912a9a7c '
* commit '
bbb2945f2dfbc2306c1655bf7eb6e220912a9a7c ':
smacker: check the return value of smacker_decode_tree
Conflicts:
libavcodec/smacker.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Jun 2013 22:27:48 +0000 (00:27 +0200)]
Merge commit '
f52edef30197735bfb937e9e723ab1e7b31165c6 '
* commit '
f52edef30197735bfb937e9e723ab1e7b31165c6 ':
smacker: fix an off by one in huff.length computation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Jun 2013 22:21:22 +0000 (00:21 +0200)]
Merge commit '
985f34b75653d02eda8eb8def3412f8577f19b01 '
* commit '
985f34b75653d02eda8eb8def3412f8577f19b01 ':
utils: fix avcodec_flush_buffers pre-reference counting compatibility
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Jun 2013 22:05:02 +0000 (00:05 +0200)]
Merge commit '
df9f22d42b0905385629a9d368bb5a1eef2b45ef '
* commit '
df9f22d42b0905385629a9d368bb5a1eef2b45ef ':
avf: move url utility functions in a separate file
Conflicts:
libavformat/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Jun 2013 21:58:59 +0000 (23:58 +0200)]
Merge commit '
12db891dcd57b305d6e3c1e22ea8204dc26edda1 '
* commit '
12db891dcd57b305d6e3c1e22ea8204dc26edda1 ':
avf: move ff_write_chained to mux.c
Conflicts:
libavformat/mux.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Jun 2013 21:52:08 +0000 (23:52 +0200)]
Merge commit '
508998f7d5cc61c7ac7b049813b47adc24c6e282 '
* commit '
508998f7d5cc61c7ac7b049813b47adc24c6e282 ':
avf: move riff tags accessors where they belong
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Jun 2013 21:45:42 +0000 (23:45 +0200)]
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>
Michael Niedermayer [Sun, 16 Jun 2013 21:38:27 +0000 (23:38 +0200)]
Merge commit '
afc8685395e775fe0f2a1698b683aea4afd124af '
* commit '
afc8685395e775fe0f2a1698b683aea4afd124af ':
avf: split off format register and lookup function
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Jun 2013 21:29:37 +0000 (23:29 +0200)]
Merge commit '
f80b60ad59945dae32bb26a4e239ed94b0e92fa3 '
* commit '
f80b60ad59945dae32bb26a4e239ed94b0e92fa3 ':
bitstream: forward error values and drop few abort()
Conflicts:
libavcodec/bitstream.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Jun 2013 21:18:57 +0000 (23:18 +0200)]
Merge commit '
f776899a17dce32ad7fb9231d98f15558f37cc3f '
* commit '
f776899a17dce32ad7fb9231d98f15558f37cc3f ':
bitstream: K&R formatting cosmetics
Conflicts:
libavcodec/bitstream.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Jun 2013 20:59:59 +0000 (22:59 +0200)]
Merge commit '
9e80eda26d06c7c48dbec5dfe643c857c62c0ee7 '
* commit '
9e80eda26d06c7c48dbec5dfe643c857c62c0ee7 ':
h264_mp4toannexb_bsf: return a padded buffer
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Jun 2013 20:51:56 +0000 (22:51 +0200)]
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>
Michael Niedermayer [Sun, 16 Jun 2013 20:40:43 +0000 (22:40 +0200)]
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>
Paul B Mahol [Sun, 16 Jun 2013 18:49:51 +0000 (18:49 +0000)]
lavf: show APIC for tta files too
Fixes #2676.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sun, 16 Jun 2013 18:46:35 +0000 (18:46 +0000)]
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>
Michael Niedermayer [Sun, 16 Jun 2013 16:19:30 +0000 (18:19 +0200)]
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>
Kostya Shishkov [Wed, 12 Jun 2013 12:30:51 +0000 (14:30 +0200)]
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>
Kostya Shishkov [Wed, 12 Jun 2013 12:28:07 +0000 (14:28 +0200)]
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>
Kostya Shishkov [Wed, 12 Jun 2013 12:27:00 +0000 (14:27 +0200)]
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>
Kostya Shishkov [Wed, 12 Jun 2013 12:22:24 +0000 (14:22 +0200)]
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>
Michael Niedermayer [Sun, 16 Jun 2013 13:27:39 +0000 (15:27 +0200)]
avcodec/jpeg2000dec: move bpno check to a earlier place
This prevents additional integer overflows
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Sat, 15 Jun 2013 19:11:55 +0000 (22:11 +0300)]
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>
Luca Barbato [Sat, 15 Jun 2013 10:03:27 +0000 (12:03 +0200)]
avf: move url utility functions in a separate file
Luca Barbato [Sat, 15 Jun 2013 09:56:36 +0000 (11:56 +0200)]
avf: move ff_write_chained to mux.c
Luca Barbato [Sat, 15 Jun 2013 09:44:07 +0000 (11:44 +0200)]
avf: move riff tags accessors where they belong
Luca Barbato [Sat, 15 Jun 2013 09:41:36 +0000 (11:41 +0200)]
avf: move ff_http_match_no_proxy to network
It is only used by network protocols.
Luca Barbato [Sat, 15 Jun 2013 09:26:09 +0000 (11:26 +0200)]
avf: split off format register and lookup function
James Almer [Sun, 16 Jun 2013 00:29:08 +0000 (21:29 -0300)]
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>
James Almer [Sun, 16 Jun 2013 00:29:07 +0000 (21:29 -0300)]
lavu/hash: Add support for RIPEMD
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Sun, 16 Jun 2013 07:46:17 +0000 (09:46 +0200)]
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>
Luca Barbato [Sat, 15 Jun 2013 08:28:30 +0000 (10:28 +0200)]
bitstream: forward error values and drop few abort()
Luca Barbato [Sat, 15 Jun 2013 08:19:51 +0000 (10:19 +0200)]
bitstream: K&R formatting cosmetics
Michael Niedermayer [Sat, 15 Jun 2013 23:07:13 +0000 (01:07 +0200)]
Merge branch 'crypto' of https://github.com/jamrial/FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sat, 15 Jun 2013 17:04:19 +0000 (14:04 -0300)]
lavu: Add RIPEMD hashing
Includes RIPEMD-128, RIPEMD-160, RIPEMD-256 and RIPEMD-320
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 15 Jun 2013 17:03:37 +0000 (14:03 -0300)]
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>
James Almer [Sun, 2 Jun 2013 20:48:49 +0000 (17:48 -0300)]
lavu/hash: Add support for SHA-2 512
Signed-off-by: James Almer <jamrial@gmail.com>
Paul B Mahol [Sat, 15 Jun 2013 20:55:27 +0000 (20:55 +0000)]
lavu/utils: silence warnings about incompatible pointer types
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Andrey Utkin [Sat, 15 Jun 2013 20:03:38 +0000 (23:03 +0300)]
Document "cache" protocol
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Tue, 11 Jun 2013 15:57:31 +0000 (17:57 +0200)]
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.
Luca Barbato [Tue, 11 Jun 2013 14:44:04 +0000 (16:44 +0200)]
h264_mp4toannexb_bsf: factor out extradata parsing
Michael Niedermayer [Sat, 15 Jun 2013 11:10:43 +0000 (13:10 +0200)]
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>
Michael Niedermayer [Fri, 7 Jun 2013 00:25:34 +0000 (02:25 +0200)]
avutil/utils: check and warn about llrint() brokenness
Such broken llrint() exist for example on netbsd
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Tue, 11 Jun 2013 14:12:01 +0000 (16:12 +0200)]
h264_mp4toannexb_bsf: K&R formatting cosmetics
James Almer [Fri, 14 Jun 2013 08:42:57 +0000 (05:42 -0300)]
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>
James Almer [Fri, 14 Jun 2013 08:42:56 +0000 (05:42 -0300)]
lavu/crc: Fix doxy group definition
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Fri, 14 Jun 2013 08:42:55 +0000 (05:42 -0300)]
lavu/adler32: Fix doxy group definition
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Jun 2013 19:13:47 +0000 (21:13 +0200)]
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>
Michael Niedermayer [Fri, 14 Jun 2013 17:20:10 +0000 (19:20 +0200)]
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>
Michael Niedermayer [Fri, 14 Jun 2013 17:16:47 +0000 (19:16 +0200)]
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>
Paul B Mahol [Thu, 6 Jun 2013 13:35:49 +0000 (13:35 +0000)]
apetag: do not require seekable output
Also don't write empty tags.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Fri, 14 Jun 2013 13:20:48 +0000 (15:20 +0200)]
avcodec_encode_audio2: fix memleak on last padded frame
Regression introduced by
799f57ac96f9891d1a0f7d6c4b218ed536e8aca5
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Thu, 11 Apr 2013 16:57:15 +0000 (09:57 -0700)]
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>
Hendrik Leppkes [Thu, 13 Jun 2013 22:15:10 +0000 (00:15 +0200)]
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>
Clément Bœsch [Fri, 14 Jun 2013 04:53:45 +0000 (06:53 +0200)]
lavfi/spp: fix description.
Timothy Gu [Tue, 11 Jun 2013 23:52:12 +0000 (16:52 -0700)]
doc/general: Make the license status of the Android libraries clearer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jean Delvare [Wed, 12 Jun 2013 08:48:57 +0000 (10:48 +0200)]
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>
Michael Niedermayer [Thu, 13 Jun 2013 23:54:30 +0000 (01:54 +0200)]
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>
Clément Bœsch [Thu, 13 Jun 2013 23:09:11 +0000 (01:09 +0200)]
lavfi/mp: remove mp=spp.
The filter was ported to a native libavfilter filter.
Clément Bœsch [Sat, 11 May 2013 10:03:38 +0000 (12:03 +0200)]
lavfi: add spp filter.
Michael Niedermayer [Thu, 13 Jun 2013 22:35:52 +0000 (00:35 +0200)]
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>
Paul B Mahol [Thu, 13 Jun 2013 21:49:18 +0000 (21:49 +0000)]
lavc: copy AVCodecContext for threads
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Thu, 13 Jun 2013 20:11:07 +0000 (22:11 +0200)]
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>
Michael Niedermayer [Thu, 13 Jun 2013 12:57:00 +0000 (14:57 +0200)]
avutil/timestamp: remove ""
This may fix an error with C++
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Jun 2013 12:51:59 +0000 (14:51 +0200)]
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>
Michael Niedermayer [Thu, 13 Jun 2013 12:38:01 +0000 (14:38 +0200)]
Merge commit '
fbd0dacc8d61ab418b3fa8e7be22017558323e56 '
* commit '
fbd0dacc8d61ab418b3fa8e7be22017558323e56 ':
4xm: refactor decode_p_block
Conflicts:
libavcodec/4xm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Jun 2013 12:10:06 +0000 (14:10 +0200)]
Merge commit '
94aefb1932be882fd93f66cf790ceb19ff575c19 '
* commit '
94aefb1932be882fd93f66cf790ceb19ff575c19 ':
4xm: do not overread the source buffer in decode_p_block
Conflicts:
libavcodec/4xm.c
The checks are replaced by av_assert0() as the conditions should
be impossible. If these asserts fail, there is a bug elsewhere
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Jun 2013 11:56:14 +0000 (13:56 +0200)]
Merge commit '
be373cb50d3c411366fec7eef2eb3681abe48f96 '
* commit '
be373cb50d3c411366fec7eef2eb3681abe48f96 ':
4xm: do not overread the prestream buffer
Conflicts:
libavcodec/4xm.c
See:
9c661e95
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Jun 2013 11:41:27 +0000 (13:41 +0200)]
Merge commit '
de2e5777e225e75813daf2373c95e223651fd89a '
* commit '
de2e5777e225e75813daf2373c95e223651fd89a ':
4xm: validate the buffer size before parsing it
Conflicts:
libavcodec/4xm.c
See:
9c661e95
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Jun 2013 11:07:01 +0000 (13:07 +0200)]
Merge commit '
145023f57262d21474e35b4a6069cf95136339d4 '
* commit '
145023f57262d21474e35b4a6069cf95136339d4 ':
4xm: reject frames not compatible with the declared version
See:
c433823750bf096187e70c22822431a7c0bb4202
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Jun 2013 10:57:34 +0000 (12:57 +0200)]
Merge commit '
1f0c6075604c271d5627480f1243d22795f9a315 '
* commit '
1f0c6075604c271d5627480f1243d22795f9a315 ':
4xm: drop pointless assert
Conflicts:
libavcodec/4xm.c
The added condition is impossible to occur and thus is added to the assert.
The assert is not removed from the default case, as the default case cannot
occur. Thus either it should stay as is or the case as a whole be removed.
For extra safety, to ensure this doesnt change the assert is changed to
av_assert0()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Jun 2013 10:21:36 +0000 (12:21 +0200)]
Merge commit '
b8b809908ec547b2609dbac24194f4fd2df61aea '
* commit '
b8b809908ec547b2609dbac24194f4fd2df61aea ':
4xm: forward errors from decode_p_block
Conflicts:
libavcodec/4xm.c
Impossible to be false check has been replaced by av_assert0()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Jun 2013 10:10:05 +0000 (12:10 +0200)]
Merge commit '
50ec1db62d977b6e864f315a53c1c580a6d7efa4 '
* commit '
50ec1db62d977b6e864f315a53c1c580a6d7efa4 ':
4xm: fold last_picture lazy allocation in decode_p_frame
Conflicts:
libavcodec/4xm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Jun 2013 09:56:31 +0000 (11:56 +0200)]
Merge commit '
42d73f7f6bea0ee0f64a3ad4882860ce5b923a11 '
* commit '
42d73f7f6bea0ee0f64a3ad4882860ce5b923a11 ':
4xm: do not overread while parsing header
Conflicts:
libavformat/4xm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Jun 2013 08:08:50 +0000 (10:08 +0200)]
Merge commit '
e7a44f87d07655ec0cd31c315936931674434340 '
* commit '
e7a44f87d07655ec0cd31c315936931674434340 ':
4xm: refactor fourxm_read_header
Conflicts:
libavformat/4xm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Jun 2013 07:50:42 +0000 (09:50 +0200)]
Merge commit '
e6496ea7e7ea7355167a1ccbe67a7199d446a654 '
* commit '
e6496ea7e7ea7355167a1ccbe67a7199d446a654 ':
4xm: K&R formatting cosmetics
Conflicts:
libavformat/4xm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Jun 2013 07:41:27 +0000 (09:41 +0200)]
Merge commit '
08859d19b429c522d6494c186656f4a2d3ff8e21 '
* commit '
08859d19b429c522d6494c186656f4a2d3ff8e21 ':
4xm: use the correct logging context
g2meet: Fix a typo in the height comparison
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 12 Jun 2013 22:46:15 +0000 (00:46 +0200)]
h264: Try parsing SPS as complete NAL in more cases
Fixes Ticket2580
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Wed, 12 Jun 2013 23:29:23 +0000 (01:29 +0200)]
require --enable-gpl for using the frei0r filter
frei0r license is GPL.
Based on a patch by Timothy Gu <timothygu99@gmail.com>.
See thread:
Subject: [FFmpeg-devel] [PATCH 1/2] LICENSE: Complete GPL'd external libraries list
Date: Thu, 6 Jun 2013 18:55:30 -0700
Stefano Sabatini [Tue, 11 Jun 2013 14:02:39 +0000 (16:02 +0200)]
lavfi/rotate: add angle command
Stefano Sabatini [Wed, 12 Jun 2013 15:24:44 +0000 (17:24 +0200)]
tests: add filter-pixfmts-rotate test
Stefano Sabatini [Tue, 11 Jun 2013 08:31:59 +0000 (10:31 +0200)]
lavfi: add rotate filter
Based on the libavfilter SOC filter by Vitor Sessak, with the following additions:
* integer arithmetic
* bilinear interpolation
* RGB path
* configurable parametric angle, output width and height
Address trac issue #1500.
See thread:
Subject: [FFmpeg-devel] [WIP] rotate filter(s)
Date: 2010-10-03 17:35:49 GMT
Timothy Gu [Tue, 11 Jun 2013 23:58:01 +0000 (16:58 -0700)]
doc/encoders: Add libvo-amrwbenc doc
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 12 Jun 2013 14:16:59 +0000 (16:16 +0200)]
alacenc: Fix missing sign_extend()
Possibly fixes Ticket2497
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Mon, 10 Jun 2013 14:37:43 +0000 (16:37 +0200)]
4xm: check bitstream_size boundary before using it
Prevent buffer overread.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Sun, 9 Jun 2013 19:50:57 +0000 (21:50 +0200)]
4xm: refactor decode_p_block
Directly return from code 1, 2 and 6 codepaths and simplify the
remaining one to have a single overflow check and a single call to
mcdc.
Luca Barbato [Sun, 9 Jun 2013 16:27:05 +0000 (18:27 +0200)]
4xm: do not overread the source buffer in decode_p_block
Check for out of picture macroblocks before calling mcdc.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org