ffmpeg.git
7 years agodoc/general: remove obsolete info about APE decoder
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>
7 years agoMerge remote-tracking branch 'qatar/master'
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>
7 years agoMerge commit '3f0b6d7a6248a33df37b98cfcb37a1acce263f62'
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>
7 years agoMerge commit 'f36d7831d96aeb072db5a2b78892a534d96e288e'
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>
7 years agoMerge commit '3eae9b030cbbdc263f69834b791624613032d548'
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>
7 years agoavformat/utils: Keep internal and external av_read_frame() packets in sync.
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>
7 years agolavfi/mp: try to pass interlaced & tff flags
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>
7 years agolavfi/lut3d: avoid overread.
Clément Bœsch [Wed, 22 May 2013 20:12:14 +0000 (22:12 +0200)]
lavfi/lut3d: avoid overread.

7 years agowavpack: check packet size early
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
7 years agowavpack: use bytestream2 in wavpack_decode_block
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
7 years agoavcodec/aic: Fix vlc value checks
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>
7 years agopixdesc: mark gray8 as pseudopal
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

7 years agoproresdec: Fix end condition
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>
7 years agosmvjpegdec: use av_pix_fmt_desc_get() avoid direct table access
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>
7 years agov4l2: make possible to disable libv4l2 at runtime.
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.

7 years agolavfi: add lut3d filter.
Clément Bœsch [Tue, 7 May 2013 12:48:56 +0000 (14:48 +0200)]
lavfi: add lut3d filter.

Fixes part of Ticket #2517.

7 years agoshorten: fix "off by padding" bug
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>
7 years agompegvideo: unref buffers in ff_mpeg_unref_picture on frame size changes
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.

7 years agoSupport playing SMV files.
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>
7 years agoavienc: Disallow the first frame to be skiped
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>
7 years agoMerge remote-tracking branch 'qatar/master'
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>
7 years agoMerge remote-tracking branch 'cehoyos/master'
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>
7 years agoj2kdec & jpeg2000dec: check lengthinc against array size
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>
7 years agoj2k & jpeg2000dec: reset numX/Ytiles if tiles failed allocation
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>
7 years agoavcodec/jpeg2000dec: Port tile size check from j2kdec
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>
7 years agojpeg2000dec: check TPsot
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>
7 years agojpeg2000dec: read and check curtileno
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>
7 years agojpeg2000dec & j2kdec: Fix return type of get_sot()
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>
7 years agovcodec/jpeg2000dec: fix av_log() type
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>
7 years agoj2kdec: cosmetics from jpeg2000dec
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>
7 years agoavcodec/jpeg2000dec: merge bytestream2 reading from j2kdec
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>
7 years agoavcodec/jpeg2000dec: get_qcx, fix stack and heap overwrites
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>
7 years agoAdd a fate test for ProRes Transparency.
Carl Eugen Hoyos [Tue, 21 May 2013 21:09:19 +0000 (23:09 +0200)]
Add a fate test for ProRes Transparency.

7 years agolavu/opt: check if class is NULL too
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>
7 years agolavfi/(a)showinfo: use link frame counter instead of local counter.
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.

7 years agoavutil/pixfmt: add forgotten deprecated to YUVJ411
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>
7 years agojpeg2000dec: Check ncomponents and tile dimensions
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>
7 years agoavcodec/j2k: rename J2K_ constants to JPEG2000_
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>
7 years agoj2k: Rename structs to be more similar to jpeg2000dec
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>
7 years agoj2kdec: s/decode_packets/jpeg2000_decode_packets/
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>
7 years agolavfi/geq: prefer symbolic constants
Stefano Sabatini [Sun, 19 May 2013 21:32:02 +0000 (23:32 +0200)]
lavfi/geq: prefer symbolic constants

Hopefully enhance readability.

7 years agolavfi/geq: add aliases for RGB options
Stefano Sabatini [Sun, 19 May 2013 21:24:21 +0000 (23:24 +0200)]
lavfi/geq: add aliases for RGB options

7 years agovp3: zero allocated tables
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>
7 years agoconfigure: Enable the strtod workaround when building for bionic
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>
7 years agoseek-test: make duration user configurable
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>
7 years agolavfi/yadif: add timeline support.
Clément Bœsch [Tue, 21 May 2013 12:52:34 +0000 (14:52 +0200)]
lavfi/yadif: add timeline support.

7 years agoavcodec/huffman: increase bits constant
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>
7 years agoavcodec/huffman: use named identifer for the bits constant
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>
7 years agoavcodec/bitstream: print vlc length in error case.
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>
7 years agomjpegdec: fix AV_PIX_FMT_YUVJ411P handling
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>
7 years agoadd YUVJ411P
Michael Niedermayer [Mon, 20 May 2013 13:12:10 +0000 (15:12 +0200)]
add YUVJ411P

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
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>
7 years agoMerge commit 'cfbd98abe82cfcb9984a18d08697251b72b110c8'
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>
7 years agoMerge commit 'c209d0df657f172f42d9bafbcdfa02dfb14f6965'
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>
7 years agoMerge commit 'a030279a67ef883df8cf3707774656fa1be81078'
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>
7 years agoMerge commit '8aa3500905fec6c4e657bb291b861d43c34d3de9'
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>
7 years agoproresdec: simplify slice component offsets handling
Kostya Shishkov [Sat, 18 May 2013 05:06:19 +0000 (07:06 +0200)]
proresdec: simplify slice component offsets handling

7 years agomjpegdec: validate parameters in mjpeg_decode_scan_progressive_ac
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
7 years agofate.sh: add support for build-only FATE instances
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>
7 years agoavutil/frame: continue to process bufs even if some are empty
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>
7 years agoavutil/md5: move loop inside inner function
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>
7 years agoljpeg: use the correct number of components in yuv
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
7 years agomjpeg: Validate sampling factors
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
7 years agosmacker: remove av_clip_int16()
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>
7 years agolibx264: silence: warning: the address of val will always evaluate as true
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>
7 years agolavd/v4l2enc: check write return value.
Clément Bœsch [Mon, 20 May 2013 14:33:14 +0000 (16:33 +0200)]
lavd/v4l2enc: check write return value.

7 years agoavcodec/ratecontrol: silence "warning: expected_bits may be used uninitialized in...
Michael Niedermayer [Mon, 20 May 2013 13:49:49 +0000 (15:49 +0200)]
avcodec/ratecontrol: silence "warning: expected_bits may be used uninitialized in this function"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavutil/hmac: silence pointer type warnings
Michael Niedermayer [Mon, 20 May 2013 12:48:55 +0000 (14:48 +0200)]
avutil/hmac: silence pointer type warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 20 May 2013 10:07:12 +0000 (12:07 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegvideo: unref old current_picture before allocating a new one

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'db347280eb3746d7b70888db97f1efe5f06f5624'
Michael Niedermayer [Mon, 20 May 2013 10:02:18 +0000 (12:02 +0200)]
Merge commit 'db347280eb3746d7b70888db97f1efe5f06f5624'

* commit 'db347280eb3746d7b70888db97f1efe5f06f5624':
  vorbis: fallback to normal division instead of crashing

Conflicts:
libavcodec/vorbisdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'ddf1b4a2f8a680126eb611428e4f47e6e5b8c6c0'
Michael Niedermayer [Mon, 20 May 2013 09:36:55 +0000 (11:36 +0200)]
Merge commit 'ddf1b4a2f8a680126eb611428e4f47e6e5b8c6c0'

* commit 'ddf1b4a2f8a680126eb611428e4f47e6e5b8c6c0':
  vorbis: simplify the inner loop in setup_classifs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '36f10380043c8b8c5cbf8c1add8695089cdaa341'
Michael Niedermayer [Mon, 20 May 2013 09:28:15 +0000 (11:28 +0200)]
Merge commit '36f10380043c8b8c5cbf8c1add8695089cdaa341'

* commit '36f10380043c8b8c5cbf8c1add8695089cdaa341':
  vorbis: use normal integer values for iterators

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/filters: add RGB geq example
Stefano Sabatini [Sun, 19 May 2013 20:54:49 +0000 (22:54 +0200)]
doc/filters: add RGB geq example

7 years agodoc/filters: extend/fix documentation for the geq filter
Stefano Sabatini [Sun, 19 May 2013 20:54:27 +0000 (22:54 +0200)]
doc/filters: extend/fix documentation for the geq filter

7 years agoMerge commit '98186578a2a21af5bfe6dd71d222dc270f763c7d'
Michael Niedermayer [Mon, 20 May 2013 08:58:43 +0000 (10:58 +0200)]
Merge commit '98186578a2a21af5bfe6dd71d222dc270f763c7d'

* commit '98186578a2a21af5bfe6dd71d222dc270f763c7d':
  vorbis: refactor vorbis_residue_decode_internal

Conflicts:
libavcodec/vorbisdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'c360fb174b01170ab3fd3048d4d0acb44aa4e834'
Michael Niedermayer [Mon, 20 May 2013 08:52:12 +0000 (10:52 +0200)]
Merge commit 'c360fb174b01170ab3fd3048d4d0acb44aa4e834'

* commit 'c360fb174b01170ab3fd3048d4d0acb44aa4e834':
  win32: Do not use GetProcAddress when compiled for Vista+

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '0b6899f154347cdd0aa66c5ec16ed9c65871766f'
Michael Niedermayer [Mon, 20 May 2013 08:45:27 +0000 (10:45 +0200)]
Merge commit '0b6899f154347cdd0aa66c5ec16ed9c65871766f'

* commit '0b6899f154347cdd0aa66c5ec16ed9c65871766f':
  configure: msvc: Set the target windows version to XP if no target is set

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomd5: optimize second round by using 4-operation form of G()
Giorgio Vazzana [Sat, 18 May 2013 11:53:52 +0000 (13:53 +0200)]
md5: optimize second round by using 4-operation form of G()

4-operation form is preferred over 3-operation because it breaks a long
dependency chain, thus allowing a superscalar processor to execute more
operations in parallel.
The idea was taken from: http://www.zorinaq.com/papers/md5-amd64.html

AMD Athlon(tm) II X3 450 Processor, x86_64

$ for i in $(seq 1 4); do ./avutil_md5_test2; done
size: 1048576  runs: 1024  time:    5.821 +- 0.019
size: 1048576  runs: 1024  time:    5.822 +- 0.019
size: 1048576  runs: 1024  time:    5.841 +- 0.018
size: 1048576  runs: 1024  time:    5.821 +- 0.018

$ for i in $(seq 1 4); do ./avutil_md5_test2; done
size: 1048576  runs: 1024  time:    5.646 +- 0.019
size: 1048576  runs: 1024  time:    5.646 +- 0.018
size: 1048576  runs: 1024  time:    5.642 +- 0.019
size: 1048576  runs: 1024  time:    5.641 +- 0.019

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/geq: mark timeline support
Stefano Sabatini [Sun, 19 May 2013 22:20:08 +0000 (00:20 +0200)]
lavfi/geq: mark timeline support

7 years agolavd: add v4l2 outdev.
Clément Bœsch [Sun, 19 May 2013 21:36:10 +0000 (23:36 +0200)]
lavd: add v4l2 outdev.

7 years agolavd/v4l2: move pixel format conversion code to a separate place.
Clément Bœsch [Sun, 19 May 2013 21:35:07 +0000 (23:35 +0200)]
lavd/v4l2: move pixel format conversion code to a separate place.

This will be shared with the output device.

7 years agoavformat/matroskadec: fix integer overflow
Michael Niedermayer [Sun, 19 May 2013 21:38:01 +0000 (23:38 +0200)]
avformat/matroskadec: fix integer overflow

Fixes fate-mkv with ekopath 4

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompegvideo: unref old current_picture before allocating a new one
Janne Grunau [Sun, 19 May 2013 12:49:55 +0000 (14:49 +0200)]
mpegvideo: unref old current_picture before allocating a new one

Allows decoding with only three frame buffers with frame reference
counting. Fixes VAAPI based decoding in vlc which uses only three
frame buffers for the mpegvideo-based codecs.

7 years agovorbis: fallback to normal division instead of crashing
Luca Barbato [Sun, 19 May 2013 17:06:54 +0000 (19:06 +0200)]
vorbis: fallback to normal division instead of crashing

The use of ff_inverse speeds up slightly arches + compilers that
do not provide a division faster than the whole machinery, such
as ppc32 + gcc4.7, but has operational limits.

Drop the always-enable assert and provide a fallback.

7 years agovorbis: simplify the inner loop in setup_classifs
Luca Barbato [Sun, 19 May 2013 16:59:13 +0000 (18:59 +0200)]
vorbis: simplify the inner loop in setup_classifs

7 years agovorbis: use normal integer values for iterators
Luca Barbato [Sun, 19 May 2013 16:57:52 +0000 (18:57 +0200)]
vorbis: use normal integer values for iterators

No need to use fixed-size integers.

7 years agovorbis: refactor vorbis_residue_decode_internal
Luca Barbato [Sat, 18 May 2013 13:33:39 +0000 (15:33 +0200)]
vorbis: refactor vorbis_residue_decode_internal

7 years agoconfigure: add more allocation functions to valgrind-massif
Michael Niedermayer [Sun, 19 May 2013 18:16:20 +0000 (20:16 +0200)]
configure: add more allocation functions to valgrind-massif

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocmdutils: show timeline support in -filters listing
Stefano Sabatini [Sun, 19 May 2013 15:30:23 +0000 (17:30 +0200)]
cmdutils: show timeline support in -filters listing

7 years agolavfi/drawgrid: fix drawgrid options after 4c205f42c86
Stefano Sabatini [Sun, 19 May 2013 17:20:00 +0000 (19:20 +0200)]
lavfi/drawgrid: fix drawgrid options after 4c205f42c86

7 years agodoc/Makefile: install .3 man pages to man3 subdir
Stefano Sabatini [Sat, 18 May 2013 13:10:21 +0000 (15:10 +0200)]
doc/Makefile: install .3 man pages to man3 subdir

Fix trac ticket #2585.

7 years agobuild: drop unused ALLMANPAGES variable
Stefano Sabatini [Sun, 19 May 2013 15:01:59 +0000 (17:01 +0200)]
build: drop unused ALLMANPAGES variable

7 years agomjpeg_decode_com: remove redundant len checks
Michael Niedermayer [Sun, 19 May 2013 16:03:53 +0000 (18:03 +0200)]
mjpeg_decode_com: remove redundant len checks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomjpegdec: Fix field orderforinterlacedAVDJand AVRN in ntsc mode
Piotr Bandurski [Sun, 19 May 2013 09:24:41 +0000 (11:24 +0200)]
mjpegdec: Fix field orderforinterlacedAVDJand AVRN in ntsc mode

Fixes ticket1656

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotools: add zmqshell.py.
Clément Bœsch [Sun, 19 May 2013 15:55:19 +0000 (17:55 +0200)]
tools: add zmqshell.py.

7 years agowin32: Do not use GetProcAddress when compiled for Vista+
Jean-Baptiste Kempf [Tue, 14 May 2013 09:34:53 +0000 (11:34 +0200)]
win32: Do not use GetProcAddress when compiled for Vista+

Instead link directly to the condition variable functions.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoconfigure: msvc: Set the target windows version to XP if no target is set
Martin Storsjö [Wed, 15 May 2013 20:51:49 +0000 (23:51 +0300)]
configure: msvc: Set the target windows version to XP if no target is set

MSVC 2010 (or more precisely, Windows SDK 7.0 which comes with MSVC
2010) sets _WIN32_WINNT to the constant for Windows 7 if nothing is
set. This could lead to the libav configure script detecting and
using functions only present in Windows 7 or newer, which in most
cases isn't desired. If the caller explicitly wants this, the caller
can add the _WIN32_WINNT define via --extra-cflags, setting the desired
version.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agolavfi/histogram: cache log2 of max_hval
Paul B Mahol [Sun, 19 May 2013 14:30:42 +0000 (14:30 +0000)]
lavfi/histogram: cache log2 of max_hval

Instead of calculating same value over and over again.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoswscale/output: silence warning about undefined 'ASSERT_LEVEL'
Paul B Mahol [Sun, 19 May 2013 14:06:16 +0000 (14:06 +0000)]
swscale/output: silence warning about undefined 'ASSERT_LEVEL'

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoswscale/output: remove unused header
Paul B Mahol [Sun, 19 May 2013 14:04:14 +0000 (14:04 +0000)]
swscale/output: remove unused header

Signed-off-by: Paul B Mahol <onemda@gmail.com>