]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Fri, 24 May 2013 11:47:45 +0000 (13:47 +0200)]
Merge commit '
129bb238430ec45a3b5f8f1d384df590ddf7b62f '
* commit '
129bb238430ec45a3b5f8f1d384df590ddf7b62f ':
lavfi: add a slice threading infrastructure
Conflicts:
Changelog
cmdutils.c
doc/APIchanges
libavfilter/Makefile
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/internal.h
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 24 May 2013 11:13:03 +0000 (13:13 +0200)]
Merge commit '
2a6eaeaa85d17b27ee0dd449183ec197c35c9675 '
* commit '
2a6eaeaa85d17b27ee0dd449183ec197c35c9675 ':
Move get_logical_cpus() from lavc/pthread to lavu/cpu.
Conflicts:
doc/APIchanges
libavcodec/pthread.c
libavutil/cpu.c
libavutil/cpu.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 24 May 2013 10:32:18 +0000 (12:32 +0200)]
Merge commit '
90f9a5830b5d332de7ebb1ab45589f1870cbd65d '
* commit '
90f9a5830b5d332de7ebb1ab45589f1870cbd65d ':
w32pthreads: move from lavc to compat/
Conflicts:
libavcodec/Makefile
libavcodec/pthread.c
libavcodec/vp8.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 24 May 2013 10:24:53 +0000 (12:24 +0200)]
Merge commit '
e69222c50755030eef921e899e38b71a111093d9 '
* commit '
e69222c50755030eef921e899e38b71a111093d9 ':
doxy: enable TYPEDEF_HIDES_STRUCT
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 24 May 2013 10:04:18 +0000 (12:04 +0200)]
Merge commit '
e9e5a1bdc769a7225ab0d4f8b33bcacc6496bd68 '
* commit '
e9e5a1bdc769a7225ab0d4f8b33bcacc6496bd68 ':
Monkey's Audio old versions FATE tests
h264_parser: Set field_order and picture_structure.
Conflicts:
libavcodec/h264_parser.c
tests/fate/lossless-audio.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Fri, 24 May 2013 09:10:22 +0000 (11:10 +0200)]
lavu/opencl: remove semi-colon from macro.
Fixes compilation when the macros are empty and the label above ends up
containing no statement. Also makes usage of these macro consistent
(some already have a semi colon, some others don't).
Fixes Ticket #2603
Michael Niedermayer [Fri, 24 May 2013 09:51:58 +0000 (11:51 +0200)]
Merge commit '
b493847df4ff8ce46f258749e4a3f304696b34c1 '
* commit '
b493847df4ff8ce46f258749e4a3f304696b34c1 ':
avcodec: Add picture structure information to AVCodecParserContext.
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Sat, 11 May 2013 18:41:46 +0000 (20:41 +0200)]
lavfi: add a slice threading infrastructure
Mostly based on libavcodec's
Anton Khirnov [Thu, 23 May 2013 06:59:07 +0000 (08:59 +0200)]
Move get_logical_cpus() from lavc/pthread to lavu/cpu.
It will be useful in lavfi, and could conceivably be useful to the user
applications as well.
Anton Khirnov [Sun, 12 May 2013 06:11:42 +0000 (08:11 +0200)]
w32pthreads: move from lavc to compat/
It will be used in other places than lavc.
Anton Khirnov [Sun, 12 May 2013 12:58:14 +0000 (14:58 +0200)]
doxy: enable TYPEDEF_HIDES_STRUCT
This means that typedef struct SomeStruct {...} SomeStruct will only be
documented as SomeStruct in the doxy, without a pointless entry in the
typedefs list.
Kostya Shishkov [Fri, 3 May 2013 08:13:00 +0000 (10:13 +0200)]
Monkey's Audio old versions FATE tests
Yusuke Nakamura [Tue, 14 May 2013 22:37:36 +0000 (07:37 +0900)]
h264_parser: Set field_order and picture_structure.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Yusuke Nakamura [Tue, 14 May 2013 22:36:15 +0000 (07:36 +0900)]
avcodec: Add picture structure information to AVCodecParserContext.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Fri, 24 May 2013 02:20:54 +0000 (04:20 +0200)]
Changelog: add entry for the S302m encoder
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Thu, 23 May 2013 20:38:53 +0000 (20:38 +0000)]
s302menc: unbreak compilation
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 23 May 2013 20:34:07 +0000 (20:34 +0000)]
s302menc: fix bits_per_raw_sample for 21, 22 & 23 case
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 23 May 2013 20:25:19 +0000 (20:25 +0000)]
lavc/codec_desc: SMPTE 302M is not lossy
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 23 May 2013 19:56:43 +0000 (19:56 +0000)]
escape124: switch to init_get_bits8()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 23 May 2013 19:53:08 +0000 (19:53 +0000)]
escape124: pass context to av_log()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 23 May 2013 19:40:15 +0000 (19:40 +0000)]
libaacplus: return meaningful error codes
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 23 May 2013 19:37:52 +0000 (19:37 +0000)]
libaacplus: cosmetics: fix indentation
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 23 May 2013 19:34:39 +0000 (19:34 +0000)]
libaacplus: move profile check above, simplifies code a little
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Thu, 23 May 2013 14:00:10 +0000 (16:00 +0200)]
tools/patcheck: fix misdetection with stuff like const_names
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Thu, 23 May 2013 12:01:51 +0000 (14:01 +0200)]
doc/filters: fix wording of color option in testsrc filters.
Clément Bœsch [Thu, 23 May 2013 11:56:08 +0000 (13:56 +0200)]
lavfi/testsrc: make nb_decimals available only in testsrc.
Clément Bœsch [Thu, 23 May 2013 11:54:08 +0000 (13:54 +0200)]
lavfi/testsrc: move color options to the color scope filter definition.
Michael Niedermayer [Wed, 22 May 2013 13:12:36 +0000 (15:12 +0200)]
avcodec/libfaac: fallback to a supported bitrate if the requested is not supported
Fixes: Ticket2587
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 23 May 2013 12:46:01 +0000 (14:46 +0200)]
avformat/mtv: remove empty comments
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 23 May 2013 12:43:42 +0000 (14:43 +0200)]
avcodec/mpegvideo: remove empty comments
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 23 May 2013 12:39:58 +0000 (14:39 +0200)]
postproc/postprocess_template: remove empty comments
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Darryl Wallace [Fri, 15 Mar 2013 04:37:07 +0000 (00:37 -0400)]
s302m encoder
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 23 May 2013 10:21:12 +0000 (10:21 +0000)]
escape130: switch to init_get_bits8()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Thu, 23 May 2013 09:05:37 +0000 (11:05 +0200)]
avcodec/wavpack: remove ;;
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Thu, 23 May 2013 10:05:28 +0000 (10:05 +0000)]
fraps: set avctx->color_range
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 23 May 2013 09:32:12 +0000 (09:32 +0000)]
doc/general: remove obsolete info about APE decoder
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Thu, 23 May 2013 08:55:00 +0000 (10:55 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
wavpack: check packet size early
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 23 May 2013 08:46:05 +0000 (10:46 +0200)]
Merge commit '
3f0b6d7a6248a33df37b98cfcb37a1acce263f62 '
* commit '
3f0b6d7a6248a33df37b98cfcb37a1acce263f62 ':
wavpack: use bytestream2 in wavpack_decode_block
Conflicts:
libavcodec/wavpack.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 23 May 2013 08:33:45 +0000 (10:33 +0200)]
Merge commit '
f36d7831d96aeb072db5a2b78892a534d96e288e '
* commit '
f36d7831d96aeb072db5a2b78892a534d96e288e ':
pixdesc: mark gray8 as pseudopal
Conflicts:
libavutil/pixdesc.c
No change as gray8 was already marked as pseudopal in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 23 May 2013 08:24:15 +0000 (10:24 +0200)]
Merge commit '
3eae9b030cbbdc263f69834b791624613032d548 '
* commit '
3eae9b030cbbdc263f69834b791624613032d548 ':
mpegvideo: unref buffers in ff_mpeg_unref_picture on frame size changes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Dale Curtis [Wed, 22 May 2013 22:17:08 +0000 (15:17 -0700)]
avformat/utils: Keep internal and external av_read_frame() packets in sync.
Otherwise, during error conditions, the caller will be left with
dangling pointers to a destructed packet => boom.
BUG=242786
TEST=ffmpeg_regression_tests
Commit slightly simplified by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Wed, 22 May 2013 20:25:54 +0000 (20:25 +0000)]
lavfi/mp: try to pass interlaced & tff flags
This makes mp=softpulldown actually useful.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Clément Bœsch [Wed, 22 May 2013 20:12:14 +0000 (22:12 +0200)]
lavfi/lut3d: avoid overread.
Luca Barbato [Wed, 22 May 2013 10:51:42 +0000 (12:51 +0200)]
wavpack: check packet size early
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Wed, 22 May 2013 10:27:04 +0000 (12:27 +0200)]
wavpack: use bytestream2 in wavpack_decode_block
Prevent most out of buffer reads.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Michael Niedermayer [Wed, 22 May 2013 19:29:45 +0000 (21:29 +0200)]
avcodec/aic: Fix vlc value checks
Fixes out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Sat, 4 May 2013 11:57:32 +0000 (13:57 +0200)]
pixdesc: mark gray8 as pseudopal
Many functions treat it as such already.
Fixes Bug 499.
CC:libav-stable@libav.org
Michael Niedermayer [Wed, 22 May 2013 17:44:12 +0000 (19:44 +0200)]
proresdec: Fix end condition
Fixes out of array writes
No FFmpeg release is affected by this
This also fixes some artifacts
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 22 May 2013 16:23:57 +0000 (18:23 +0200)]
smvjpegdec: use av_pix_fmt_desc_get() avoid direct table access
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Mon, 20 May 2013 13:43:31 +0000 (15:43 +0200)]
v4l2: make possible to disable libv4l2 at runtime.
Also disable it by default since it looks currently buggy. The
usefulness of such library is mostly limited to backward compatibility
with very old devices.
Clément Bœsch [Tue, 7 May 2013 12:48:56 +0000 (14:48 +0200)]
lavfi: add lut3d filter.
Fixes part of Ticket #2517.
Michael Niedermayer [Wed, 22 May 2013 15:39:22 +0000 (17:39 +0200)]
shorten: fix "off by padding" bug
Fixes array overread
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Tue, 21 May 2013 15:39:27 +0000 (17:39 +0200)]
mpegvideo: unref buffers in ff_mpeg_unref_picture on frame size changes
ff_mpeg_unref_picture clears the flag indicating that the frame needs to
be reallocated after a frame size change. Since we have now reference
counted buffers we can unref the buffers immediately.
Ash Hughes [Wed, 22 May 2013 01:16:51 +0000 (01:16 +0000)]
Support playing SMV files.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 20 May 2013 16:58:39 +0000 (18:58 +0200)]
avienc: Disallow the first frame to be skiped
Fixes Ticket2386
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 22 May 2013 08:57:39 +0000 (10:57 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Enable the strtod workaround when building for bionic
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 22 May 2013 02:27:07 +0000 (04:27 +0200)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Add a fate test for ProRes Transparency.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 22 May 2013 02:05:36 +0000 (04:05 +0200)]
j2kdec & jpeg2000dec: check lengthinc against array size
Fixes out of array reads
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 22 May 2013 01:17:35 +0000 (03:17 +0200)]
j2k & jpeg2000dec: reset numX/Ytiles if tiles failed allocation
Fixes null pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 22 May 2013 01:12:44 +0000 (03:12 +0200)]
avcodec/jpeg2000dec: Port tile size check from j2kdec
Fixes potential integer overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 22 May 2013 00:31:03 +0000 (02:31 +0200)]
jpeg2000dec: check TPsot
Fixes out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 22 May 2013 00:29:00 +0000 (02:29 +0200)]
jpeg2000dec: read and check curtileno
Fixes out of array accesses
Code ported from j2kdec
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 22 May 2013 00:13:22 +0000 (02:13 +0200)]
jpeg2000dec & j2kdec: Fix return type of get_sot()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 22 May 2013 00:05:50 +0000 (02:05 +0200)]
vcodec/jpeg2000dec: fix av_log() type
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 21 May 2013 23:25:52 +0000 (01:25 +0200)]
j2kdec: cosmetics from jpeg2000dec
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 21 May 2013 23:23:56 +0000 (01:23 +0200)]
avcodec/jpeg2000dec: merge bytestream2 reading from j2kdec
This fixes at least one out of array access
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 21 May 2013 21:38:26 +0000 (23:38 +0200)]
avcodec/jpeg2000dec: get_qcx, fix stack and heap overwrites
This is likely remotely exploitable
Fix ported from j2kdec
No uptodate FFmpeg release should be affected by this
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Tue, 21 May 2013 21:09:19 +0000 (23:09 +0200)]
Add a fate test for ProRes Transparency.
Paul B Mahol [Tue, 21 May 2013 20:48:42 +0000 (20:48 +0000)]
lavu/opt: check if class is NULL too
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Clément Bœsch [Tue, 21 May 2013 20:27:07 +0000 (22:27 +0200)]
lavfi/(a)showinfo: use link frame counter instead of local counter.
Michael Niedermayer [Tue, 21 May 2013 19:49:28 +0000 (21:49 +0200)]
avutil/pixfmt: add forgotten deprecated to YUVJ411
Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 21 May 2013 19:36:32 +0000 (21:36 +0200)]
jpeg2000dec: Check ncomponents and tile dimensions
Fixes various problems
Code ported from j2kdec
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 21 May 2013 19:27:56 +0000 (21:27 +0200)]
avcodec/j2k: rename J2K_ constants to JPEG2000_
This should simplify merging the 2 decoders
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 21 May 2013 19:19:05 +0000 (21:19 +0200)]
j2k: Rename structs to be more similar to jpeg2000dec
This should simplify merging
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 21 May 2013 19:14:00 +0000 (21:14 +0200)]
j2kdec: s/decode_packets/jpeg2000_decode_packets/
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sun, 19 May 2013 21:32:02 +0000 (23:32 +0200)]
lavfi/geq: prefer symbolic constants
Hopefully enhance readability.
Stefano Sabatini [Sun, 19 May 2013 21:24:21 +0000 (23:24 +0200)]
lavfi/geq: add aliases for RGB options
Paul B Mahol [Fri, 17 May 2013 12:48:03 +0000 (12:48 +0000)]
vp3: zero allocated tables
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Martin Storsjö [Tue, 21 May 2013 08:43:00 +0000 (11:43 +0300)]
configure: Enable the strtod workaround when building for bionic
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Mon, 20 May 2013 02:21:34 +0000 (04:21 +0200)]
seek-test: make duration user configurable
Previously this was hardcoded to 4 seconds
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Tue, 21 May 2013 12:52:34 +0000 (14:52 +0200)]
lavfi/yadif: add timeline support.
Michael Niedermayer [Tue, 21 May 2013 11:40:01 +0000 (13:40 +0200)]
avcodec/huffman: increase bits constant
Fixes Ticket2593
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 21 May 2013 11:37:00 +0000 (13:37 +0200)]
avcodec/huffman: use named identifer for the bits constant
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 21 May 2013 11:24:40 +0000 (13:24 +0200)]
avcodec/bitstream: print vlc length in error case.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 22 Apr 2013 20:11:45 +0000 (22:11 +0200)]
mjpegdec: fix AV_PIX_FMT_YUVJ411P handling
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 20 May 2013 13:12:10 +0000 (15:12 +0200)]
add YUVJ411P
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 21 May 2013 10:01:54 +0000 (12:01 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
proresdec: simplify slice component offsets handling
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 21 May 2013 09:51:49 +0000 (11:51 +0200)]
Merge commit '
cfbd98abe82cfcb9984a18d08697251b72b110c8 '
* commit '
cfbd98abe82cfcb9984a18d08697251b72b110c8 ':
mjpegdec: validate parameters in mjpeg_decode_scan_progressive_ac
Conflicts:
libavcodec/mjpegdec.c
See:
1f41cffe1e3e79620f587545bdfcbd7e6e68ed29
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 21 May 2013 09:36:49 +0000 (11:36 +0200)]
Merge commit '
c209d0df657f172f42d9bafbcdfa02dfb14f6965 '
* commit '
c209d0df657f172f42d9bafbcdfa02dfb14f6965 ':
fate.sh: add support for build-only FATE instances
Conflicts:
doc/fate.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 21 May 2013 09:25:46 +0000 (11:25 +0200)]
Merge commit '
a030279a67ef883df8cf3707774656fa1be81078 '
* commit '
a030279a67ef883df8cf3707774656fa1be81078 ':
ljpeg: use the correct number of components in yuv
Conflicts:
libavcodec/mjpegdec.c
See:
b2e57eb5a3cb9d5dfab601077fa0edee91e06ca5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 21 May 2013 08:49:21 +0000 (10:49 +0200)]
Merge commit '
8aa3500905fec6c4e657bb291b861d43c34d3de9 '
* commit '
8aa3500905fec6c4e657bb291b861d43c34d3de9 ':
mjpeg: Validate sampling factors
Conflicts:
libavcodec/mjpegdec.c
See:
08c37a10e9ef7e30d7b7a889ad28c7fa9c49c886
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Kostya Shishkov [Sat, 18 May 2013 05:06:19 +0000 (07:06 +0200)]
proresdec: simplify slice component offsets handling
Luca Barbato [Wed, 15 May 2013 16:41:41 +0000 (18:41 +0200)]
mjpegdec: validate parameters in mjpeg_decode_scan_progressive_ac
Prevent out of buffer write when decoding broken samples.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Diego Biurrun [Sat, 6 Oct 2012 15:22:05 +0000 (15:22 +0000)]
fate.sh: add support for build-only FATE instances
If the "build_only" variable is set in the configuration file, the
FATE client will skip running tests and just compile all targets.
Signed-off-by: Martin Storsjö <martin@martin.st>
Xidorn Quan [Mon, 20 May 2013 15:28:06 +0000 (23:28 +0800)]
avutil/frame: continue to process bufs even if some are empty
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Giorgio Vazzana [Mon, 20 May 2013 19:43:07 +0000 (21:43 +0200)]
avutil/md5: move loop inside inner function
AMD Athlon(tm) II X3 450 Processor
size:
1048576 runs: 1024 time: 5.660 +- 0.023
size:
1048576 runs: 1024 time: 5.661 +- 0.030
size:
1048576 runs: 1024 time: 5.656 +- 0.022
size:
1048576 runs: 1024 time: 5.647 +- 0.026
size:
1048576 runs: 1024 time: 5.428 +- 0.037
size:
1048576 runs: 1024 time: 5.426 +- 0.034
size:
1048576 runs: 1024 time: 5.426 +- 0.034
size:
1048576 runs: 1024 time: 5.428 +- 0.038
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Tue, 14 May 2013 14:20:14 +0000 (16:20 +0200)]
ljpeg: use the correct number of components in yuv
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Mon, 13 May 2013 17:32:04 +0000 (19:32 +0200)]
mjpeg: Validate sampling factors
They must be non-zero.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Michael Niedermayer [Mon, 20 May 2013 19:42:06 +0000 (21:42 +0200)]
smacker: remove av_clip_int16()
Fixes Ticket2425
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 20 May 2013 14:38:21 +0000 (16:38 +0200)]
libx264: silence: warning: the address of val will always evaluate as true
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>