ffmpeg.git
6 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>
6 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>
6 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>
6 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>
6 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.

6 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

6 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>
6 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>
6 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.

6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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

6 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
6 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>
6 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>
6 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>
6 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
6 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
6 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>
6 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>
6 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.

6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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

6 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

6 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>
6 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>
6 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>
6 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>
6 years agolavfi/geq: mark timeline support
Stefano Sabatini [Sun, 19 May 2013 22:20:08 +0000 (00:20 +0200)]
lavfi/geq: mark timeline support

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

6 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.

6 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>
6 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.

6 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.

6 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

6 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.

6 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

6 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>
6 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

6 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

6 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.

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

6 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>
6 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>
6 years agotools: add zmqshell.py.
Clément Bœsch [Sun, 19 May 2013 15:55:19 +0000 (17:55 +0200)]
tools: add zmqshell.py.

6 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>
6 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>
6 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>
6 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>
6 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>
6 years agoffv1dec: defuse membomb
Michael Niedermayer [Sun, 19 May 2013 11:56:13 +0000 (13:56 +0200)]
ffv1dec: defuse membomb

Fixes Ticket2589

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: use the user specified valgrind excutable for massif
Michael Niedermayer [Sun, 19 May 2013 09:24:15 +0000 (11:24 +0200)]
configure: use the user specified valgrind excutable for massif

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: fix valgrind-massif to actually work
Michael Niedermayer [Sun, 19 May 2013 09:23:28 +0000 (11:23 +0200)]
configure: fix valgrind-massif to actually work

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffserver: replace atoll() by strtoll()
Michael Niedermayer [Sun, 19 May 2013 09:13:07 +0000 (11:13 +0200)]
ffserver: replace atoll() by strtoll()

this should make it easier to support ffserver with msvc

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 19 May 2013 09:06:39 +0000 (11:06 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Escape 130 FATE test

Conflicts:
tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '8e673efc6f5b7a095557664660305148f2788d30'
Michael Niedermayer [Sun, 19 May 2013 08:53:39 +0000 (10:53 +0200)]
Merge commit '8e673efc6f5b7a095557664660305148f2788d30'

* commit '8e673efc6f5b7a095557664660305148f2788d30':
  prores: update FATE test to account for alpha plane present in the test sample
  configure: Add basic valgrind-massif support

Conflicts:
tests/fate/prores.mak
tests/ref/fate/prores-alpha

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ed50673066956d6f2201a57c3254569f2ab08d9d'
Michael Niedermayer [Sun, 19 May 2013 08:27:11 +0000 (10:27 +0200)]
Merge commit 'ed50673066956d6f2201a57c3254569f2ab08d9d'

* commit 'ed50673066956d6f2201a57c3254569f2ab08d9d':
  wavpack: validate samples size parsed in wavpack_decode_block

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '8c34558131d846d2b10389564caadaa206372fd4'
Michael Niedermayer [Sun, 19 May 2013 08:22:05 +0000 (10:22 +0200)]
Merge commit '8c34558131d846d2b10389564caadaa206372fd4'

* commit '8c34558131d846d2b10389564caadaa206372fd4':
  wavpack: return meaningful errors

Conflicts:
libavcodec/wavpack.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '0f689a3d97a1d3053ca0e9516b296909a72ff31e'
Michael Niedermayer [Sun, 19 May 2013 08:10:00 +0000 (10:10 +0200)]
Merge commit '0f689a3d97a1d3053ca0e9516b296909a72ff31e'

* commit '0f689a3d97a1d3053ca0e9516b296909a72ff31e':
  wavpack: K&R formatting cosmetics

Conflicts:
libavcodec/wavpack.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoftp: favor strtoll over atoll
Hendrik Leppkes [Sun, 19 May 2013 07:37:27 +0000 (09:37 +0200)]
ftp: favor strtoll over atoll

Both strtoll and atoll have different names on MSVC, and strtoll has a
compatibility layer in place for this case.

Fixes compilation on MSVC.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoEscape 130 FATE test
Kostya Shishkov [Tue, 14 May 2013 16:53:23 +0000 (18:53 +0200)]
Escape 130 FATE test

6 years agoprores: update FATE test to account for alpha plane present in the test sample
Kostya Shishkov [Sat, 18 May 2013 05:09:47 +0000 (07:09 +0200)]
prores: update FATE test to account for alpha plane present in the test sample

6 years agoproresdec2: Only try to decode alpha plane if four output planes were allocated.
Carl Eugen Hoyos [Sat, 18 May 2013 23:48:39 +0000 (01:48 +0200)]
proresdec2: Only try to decode alpha plane if four output planes were allocated.

Fixes a crash with MPlayer.

6 years agoFTP protocol support
Lukasz Marek [Wed, 15 May 2013 14:08:11 +0000 (16:08 +0200)]
FTP protocol support

Implementation of ftp protocol.

Fixes #1672

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: Add basic valgrind-massif support
Luca Barbato [Tue, 14 May 2013 20:15:18 +0000 (22:15 +0200)]
configure: Add basic valgrind-massif support

With the parameter --toolchain valgrind-massif, the configure
script sets reasonable defaults that can be overridden as explained
in the documentation.

6 years agowavpack: validate samples size parsed in wavpack_decode_block
Luca Barbato [Fri, 17 May 2013 16:29:15 +0000 (18:29 +0200)]
wavpack: validate samples size parsed in wavpack_decode_block

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
6 years agowavpack: return meaningful errors
Luca Barbato [Fri, 17 May 2013 16:28:33 +0000 (18:28 +0200)]
wavpack: return meaningful errors

And forward those that were already meaningful.

6 years agoavfilter/vf_deshake: check rx
Michael Niedermayer [Sat, 18 May 2013 16:28:59 +0000 (18:28 +0200)]
avfilter/vf_deshake: check rx

Fixes crash on SSE2
Fixes Ticket2443

Note, its possible to restructure the code to avoid the 16pixel limitation,
and such change is welcome!

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofmtconvert: int32_t input to int32_to_float_fmul_scalar
Christophe Gisquet [Thu, 27 Dec 2012 21:33:51 +0000 (22:33 +0100)]
fmtconvert: int32_t input to int32_to_float_fmul_scalar

It was previously declared as int.
Does not change fate results for x86.

Conflicts:

libavcodec/ppc/fmtconvert_altivec.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agowavpack: K&R formatting cosmetics
Luca Barbato [Sat, 18 May 2013 14:02:47 +0000 (16:02 +0200)]
wavpack: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoproresdec2: Support decoding transparency information.
Kostya Shishkov [Sat, 18 May 2013 14:42:29 +0000 (16:42 +0200)]
proresdec2: Support decoding transparency information.

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
6 years agomovenc: add video_track_timescale option
Jean First [Thu, 16 May 2013 21:35:05 +0000 (23:35 +0200)]
movenc: add video_track_timescale option

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomov: set block_align for MACE 3:1 and MACE 6:1
Piotr Bandurski [Sat, 18 May 2013 13:23:20 +0000 (15:23 +0200)]
mov: set block_align for MACE 3:1 and MACE 6:1

fixes remuxing of audio track from mov to aifc

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec_align_dimensions2: add missing yuva formats
Michael Niedermayer [Sat, 18 May 2013 14:19:06 +0000 (16:19 +0200)]
avcodec_align_dimensions2: add missing yuva formats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosws/output: yuv2rgb_write() assert that alpha has the correct value in the tables
Michael Niedermayer [Sat, 18 May 2013 13:08:55 +0000 (15:08 +0200)]
sws/output: yuv2rgb_write() assert that alpha has the correct value in the tables

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/filters: apply minor fixes to owdenoise documentation
Stefano Sabatini [Thu, 16 May 2013 23:00:37 +0000 (01:00 +0200)]
doc/filters: apply minor fixes to owdenoise documentation

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 18 May 2013 12:27:07 +0000 (14:27 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Escape 130 (RPL) decoder

Conflicts:
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/codec_desc.c
libavcodec/escape130.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'cebdedca57d95834a8f8098c7b6a322a1163e26b'
Michael Niedermayer [Sat, 18 May 2013 11:41:25 +0000 (13:41 +0200)]
Merge commit 'cebdedca57d95834a8f8098c7b6a322a1163e26b'

* commit 'cebdedca57d95834a8f8098c7b6a322a1163e26b':
  prores: decode alpha plane when it's present
  avfilter: check a malloc in avfilter_link().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'bf5b5d2b1561535cc013c12ab8033228bb0d0081'
Michael Niedermayer [Sat, 18 May 2013 11:31:45 +0000 (13:31 +0200)]
Merge commit 'bf5b5d2b1561535cc013c12ab8033228bb0d0081'

* commit 'bf5b5d2b1561535cc013c12ab8033228bb0d0081':
  avfilter.c: cosmetics, reformat

Conflicts:
libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd79bd6040599ef017dc45d5997fcc959ab1f71f6'
Michael Niedermayer [Sat, 18 May 2013 11:10:57 +0000 (13:10 +0200)]
Merge commit 'd79bd6040599ef017dc45d5997fcc959ab1f71f6'

* commit 'd79bd6040599ef017dc45d5997fcc959ab1f71f6':
  lavfi: factorize freeing a link

Conflicts:
libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1dd35611433c224e2231ed7ae26b5b560863a3cb'
Michael Niedermayer [Sat, 18 May 2013 10:46:54 +0000 (12:46 +0200)]
Merge commit '1dd35611433c224e2231ed7ae26b5b560863a3cb'

* commit '1dd35611433c224e2231ed7ae26b5b560863a3cb':
  vf_format: do not use the AVFilterFormats internals.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/fate: update server host key fingerprints
Michael Niedermayer [Sat, 18 May 2013 10:40:10 +0000 (12:40 +0200)]
doc/fate: update server host key fingerprints

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c5ab6088ad7b0dac461fb6757b038f5260e638e5'
Michael Niedermayer [Sat, 18 May 2013 10:22:13 +0000 (12:22 +0200)]
Merge commit 'c5ab6088ad7b0dac461fb6757b038f5260e638e5'

* commit 'c5ab6088ad7b0dac461fb6757b038f5260e638e5':
  af_aformat: cosmetics, fix indentation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b01f6041f4260fba053c2f96ce1611ea77e833a0'
Michael Niedermayer [Sat, 18 May 2013 09:40:38 +0000 (11:40 +0200)]
Merge commit 'b01f6041f4260fba053c2f96ce1611ea77e833a0'

* commit 'b01f6041f4260fba053c2f96ce1611ea77e833a0':
  lavfi: rename AVFilterFormats.format_count to nb_formats

Conflicts:
libavfilter/avfiltergraph.c
libavfilter/filtfmts.c
libavfilter/formats.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e27f4b7cbf8a3fde313cfe4b3a1880bf5031e9ae'
Michael Niedermayer [Sat, 18 May 2013 09:35:03 +0000 (11:35 +0200)]
Merge commit 'e27f4b7cbf8a3fde313cfe4b3a1880bf5031e9ae'

* commit 'e27f4b7cbf8a3fde313cfe4b3a1880bf5031e9ae':
  doxy: don't sort struct members alphabetically

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '006ec64877fb638de4b15ae5fd969e22bd0f60ca'
Michael Niedermayer [Sat, 18 May 2013 09:25:44 +0000 (11:25 +0200)]
Merge commit '006ec64877fb638de4b15ae5fd969e22bd0f60ca'

* commit '006ec64877fb638de4b15ae5fd969e22bd0f60ca':
  lavr doxy: add version.h to the lavr group
  lavc doxy: add avcodec.h to the libavcodec group.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '40020e171a3549a2c0b65ce6f2649aec868872f2'
Michael Niedermayer [Sat, 18 May 2013 09:17:52 +0000 (11:17 +0200)]
Merge commit '40020e171a3549a2c0b65ce6f2649aec868872f2'

* commit '40020e171a3549a2c0b65ce6f2649aec868872f2':
  doxy: add a section about versioning.

Conflicts:
libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>