RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
52,236 Commits 36 Branches 398 Tags 222 MiB
Commit Graph

52236 Commits

Author SHA1 Message Date
Michael Niedermayer 978e373499 cmdutils: make the "-help filter=" output less confusing 
Example:
Filter overlay
  Overlay a video source on top of the input.
    Inputs:
       #0: main (video)
       #1: overlay (video)
    Outputs:
       #0: default (video)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-18 13:03:00 +02:00
Carl Eugen Hoyos 99818ac4d3 Fix libswscale compilation with --disable-optimizations on x86-32. 
Fixes ticket #2477.
 2013-04-18 12:47:16 +02:00
Michael Niedermayer ee94362c8a Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Fix pgc compilation with --disable-optimizations.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-18 03:00:31 +02:00
Michael Niedermayer 6998af4a40 avcodec/bitstream: check codes in ff_init_vlc_sparse() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-18 02:57:03 +02:00
Michael Niedermayer fb3e3808ae avcodec/bitstream: Check bits in ff_init_vlc_sparse() 
Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-18 02:47:50 +02:00
Carl Eugen Hoyos 2ade23a7ad Fix pgc compilation with --disable-optimizations. 
-O1 disables dead code elimination on pgc, use -O instead.
 2013-04-18 02:20:04 +02:00
Michael Niedermayer bdfe60c769 xan: Check for overlapping copies 
No valid samples i found use such copies

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-18 01:55:42 +02:00
Clément Bœsch 32cc7ba8a7 fate: hot fix for gif failure. 2013-04-18 01:41:23 +02:00
Clément Bœsch b6408ffc45 lavf/gif: fix assert in avio API after dfb3231. 2013-04-18 01:13:17 +02:00
Clément Bœsch 91a5b4d480 gif: remove outdated comments. 2013-04-18 00:43:38 +02:00
Clément Bœsch 8694e87127 lavc/gif: return more meaningful error code. 2013-04-18 00:24:25 +02:00
Clément Bœsch 71411b69a2 lavc/gif: merge two allocation checks. 2013-04-18 00:24:25 +02:00
Clément Bœsch dfb323109c lavf/gif: simplify palette writing. 2013-04-18 00:24:25 +02:00
Clément Bœsch 7b972d82b6 gif: reindent after previous commits. 2013-04-18 00:24:25 +02:00
Clément Bœsch e065e8a4ea lavc/gif: crop image when possible. 
Increase compression when pictures are similar.

-f lavfi testsrc=300: 61M -> 21M
 2013-04-18 00:24:25 +02:00
Clément Bœsch 635389ccfa Cleanse GIF muxer and encoder. 
This commit removes the badly duplicated code between the encoder and
the muxer. That may sound surprising, but the encoder is now responsible
from the encoding of the picture when muxing to a .gif file. It also
does not require anymore a manual user intervention such as a -pix_fmt
rgb24 to work properly. To summarize, output gif are now easier to
generate, code is saner and simpler, and files are smaller (thanks to
the lzw encoding which was unused so far with the default .gif output).
We can certainly make things even better, but this is the first step.

FATE is updated because of the output being produced by the encoder and
not the muxer (no lzw in the muxer), and in the seek test only the size
mismatches.

Fixes Ticket #2262
 2013-04-18 00:24:25 +02:00
Stefano Sabatini 1efcab02b6 lavfi/aspect: apply hot fix for NUM:DEN syntax 2013-04-17 23:37:22 +02:00
Stefano Sabatini f04ec05f0e lavfi/setdar: fix num/den swapping in log message 2013-04-17 23:37:22 +02:00
Stefano Sabatini f212c2380a lavfi/setsar: remove spurious #if FF_API_OLD_FILTER_OPTS around init field 2013-04-17 23:37:05 +02:00
Michael Niedermayer c25224737c avutil/intfloat_readwrite: include common.h for isinf() 
Solution based on rational.c, which uses isinf() too

This should fix compilation with msvc

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-17 23:22:22 +02:00
Stefano Sabatini e252460c9b lavfi/mptestsrc: remove unused size field 2013-04-17 22:40:08 +02:00
Stefano Sabatini db84088e99 lavfi/mptestsrc: use AV_OPT_TYPE_DURATION 
Simplify.
 2013-04-17 22:40:02 +02:00
Stefano Sabatini bbf003e949 lavfi/mptestsrc: reindent option constants 2013-04-17 22:39:51 +02:00
Stefano Sabatini 3933963d7b lavfi/testsrc: fix style 2013-04-17 22:39:44 +02:00
Stefano Sabatini 7ab6312610 lavfi/testsrc: use int in place of unsigned 
Avoid implicit int->unsigned conversion, causing invalid access in case
of negative linesize.

Fix crash with:
ffplay -f lavfi testsrc,vflip
 2013-04-17 22:39:34 +02:00
Stefano Sabatini 5229b78371 lavfi/aspect: extend verbose feedback, show old SAR and DAR values 2013-04-17 22:39:26 +02:00
Stefano Sabatini fe5ca6b913 lavfi/aspect: restore ratio parsing 
Allow to set a ratio as "a:b" (with proper escaping), and correctly
honour the max parameter.
 2013-04-17 22:39:20 +02:00
Stefano Sabatini 8bfd878151 lavfi/select: factorize options definition between select and aselect 2013-04-17 22:39:04 +02:00
Stefano Sabatini dcc1b32361 lavfi/select: add support for dynamic number of outputs 2013-04-17 22:34:05 +02:00
Stefano Sabatini 565c50ac7b lavfi/select: make select_frame() return void 
Set select->select internally to the function, avoid lossy double->int
conversion causing spurious frame drop (e.g. in case the evaluation
result is positive and less than 1).
 2013-04-17 22:28:56 +02:00
Michael Niedermayer 0b3bd78714 Merge remote-tracking branch 'cigaes/master' 
* cigaes/master:
  lavfi/buffersrc: fix failed requests count.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-17 21:32:13 +02:00
Michael Niedermayer 3220083c11 ra144: Try to fix int16/uint16 warnings from pgc 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-17 21:31:11 +02:00
Michael Niedermayer cc6f848dba avutil/intfloat_readwrite: avoid comparission with INFINITY, use isinf() 
Should fix pgc warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-17 21:25:41 +02:00
Michael Niedermayer 45741dd81f vf_lut: fix simplification / off by 1 error 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-17 21:25:41 +02:00
Paul B Mahol 1de7dcb457 lavfi/stereo3d: fix interleave row output modes 
Linesizes that did not match output width produced several artifacts.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-17 17:34:17 +00:00
Clément Bœsch 7ee2daed9b lavfi/interlace: remove exec permissions. 2013-04-17 19:27:33 +02:00
Clément Bœsch 4c6fa4ef45 lavfi/lut: simplify nested component stepping. 2013-04-17 19:18:08 +02:00
Clément Bœsch 45f5bf917b lavfi/lut: reindent after previous commit. 2013-04-17 19:18:08 +02:00
Clément Bœsch 3db3b278f2 lavfi/lut: add direct path. 2013-04-17 19:18:08 +02:00
Michael Niedermayer 7f2253078d Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  indeo3: check motion vectors.

Conflicts:
	libavcodec/indeo3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-17 17:30:07 +02:00
Paul B Mahol 716588188d lavfi/stereo3d: check input width & height 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-17 15:16:48 +00:00
Michael Niedermayer 2787f7b188 Merge commit '34e6af9e204ca6bb18d8cf8ec68fe19b0e083e95' 
* commit '34e6af9e204ca6bb18d8cf8ec68fe19b0e083e95':
  indeo3: fix data size check

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-17 16:57:45 +02:00
Michael Niedermayer 4029a5ebc2 Merge commit '66531d634e75b834e89e4a6a0f7470ca018712a1' 
* commit '66531d634e75b834e89e4a6a0f7470ca018712a1':
  indeo3: switch parsing the header to bytestream2

Conflicts:
	libavcodec/indeo3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-17 16:50:34 +02:00
Michael Niedermayer e5dc5095f9 Merge commit '01d376f598fe95478036f5d1e3e5e14ffe32d4bf' 
* commit '01d376f598fe95478036f5d1e3e5e14ffe32d4bf':
  rv10: check that extradata is large enough

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-17 16:20:49 +02:00
Michael Niedermayer 4916e220a6 Merge commit 'bac8d38c0a716c8bdfdecf0ae545015c68f5df36' 
* commit 'bac8d38c0a716c8bdfdecf0ae545015c68f5df36':
  rv10: return meaningful error codes.

Conflicts:
	libavcodec/rv10.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-17 16:10:23 +02:00
Michael Niedermayer 8cff853b23 Merge commit '69f6f03cd16a09e4e848b4e82bae4993bc361cd0' 
* commit '69f6f03cd16a09e4e848b4e82bae4993bc361cd0':
  rv10: cosmetics, reformat
  qdm2: check that the FFT size is a power of 2

Conflicts:
	libavcodec/rv10.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-17 16:04:38 +02:00
Michael Niedermayer 0a946599f8 Merge commit 'ecff5acb5a738fcb4f9e206a12070dac4bf259b3' 
* commit 'ecff5acb5a738fcb4f9e206a12070dac4bf259b3':
  svq1dec: clip motion vectors to the frame size.

Conflicts:
	libavcodec/svq1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-17 15:52:10 +02:00
Michael Niedermayer 251f283b9d Merge commit 'b1bb8fb860b47e90dd67f0c5740698128fc82dcc' 
* commit 'b1bb8fb860b47e90dd67f0c5740698128fc82dcc':
  svq1dec: check that the reference frame has the same dimensions as the current one

Conflicts:
	libavcodec/svq1dec.c

See: 3b57bb478f

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-17 15:40:47 +02:00
Michael Niedermayer f60ba6c524 Merge commit 'c0771a1ac6da697f86e3b10c8fe5dbc2ee92e347' 
* commit 'c0771a1ac6da697f86e3b10c8fe5dbc2ee92e347':
  af_channelmap: cosmetics, use an extra local variable to shorten the code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-17 15:13:14 +02:00
Michael Niedermayer 74e86d3147 Merge commit 'aafed1175df76603e94c99a7748968780d6548d2' 
* commit 'aafed1175df76603e94c99a7748968780d6548d2':
  af_channelmap: sanity check input channel indices in all cases.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-17 15:04:22 +02:00