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

51548 Commits

Author SHA1 Message Date
Nicolas George d38c173dfb lavfi/af_atempo: simplify request_frame loop. 2013-04-03 17:44:10 +02:00
Nicolas George b570f24d76 lavfi/af_asetnsamples: simplify request_frame loop. 2013-04-03 17:44:10 +02:00
Nicolas George 9566ba91ab lavfi/f_ebur128: remove request_frame hack. 2013-04-03 17:44:10 +02:00
Nicolas George 77fa554b6e lavfi/vf_tile: simplify request_frame loop. 2013-04-03 17:44:10 +02:00
Nicolas George 69d67fb622 lavfi: reindent after last commit. 2013-04-03 17:44:10 +02:00
Nicolas George 79d8cfacf0 lavfi: loop on request_frame if necessary. 
Some filters need several input frames before producing output.
For these filter, it becomes simpler to return 0 in
request_frame() and let the framework call it again until
output has been produced.
 2013-04-03 17:33:27 +02:00
Michael Niedermayer c208576cef Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Fix make checkheaders without opencl headers.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-03 15:35:23 +02:00
Carl Eugen Hoyos c484b3af15 Fix make checkheaders without opencl headers. 2013-04-03 15:28:29 +02:00
Michael Niedermayer d3fc2db47e Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avfiltergraph: check for sws opts being non-NULL before using them.

Conflicts:
	libavfilter/avfiltergraph.c
	libavfilter/graphparser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-03 15:20:05 +02:00
Michael Niedermayer 4d636947b4 Merge commit '817dff578f13ce97576c609ab141508b9dc782e9' 
* commit '817dff578f13ce97576c609ab141508b9dc782e9':
  configure: Check for the atomic.h functions used in the suncc atomics header

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-03 15:08:21 +02:00
Paul B Mahol e3cc92a623 smacker: fix off by one error 
Regression since a93b572ae4.

Fixes #2426.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-03 13:01:38 +00:00
Michael Niedermayer 6ce1d87355 Merge commit 'f9f6402e9c9ce3642df981b48507df3a2d956f65' 
* commit 'f9f6402e9c9ce3642df981b48507df3a2d956f65':
  configure: prettify atomics handling.

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-03 14:46:48 +02:00
Paul B Mahol 6fcb4ae1d8 lavfi/afade * biquads: call av_frame_copy_props() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-03 11:10:00 +00:00
Paul B Mahol 0ab10f69ef lavfi/earwax: clip sample, this is what sox does 
Fixes #1884.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-03 10:55:13 +00:00
Carl Eugen Hoyos 6e90d9e206 vf_deshake: Reorder constant arguments in an if() statement. 
Fixes compilation with clang on netbsd with --disable-optimizations.

Tested-by: Paul B Mahol
 2013-04-03 12:52:38 +02:00
Paul B Mahol bf65752848 aphaser filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-03 08:33:59 +00:00
Anton Khirnov 6e3c13a559 avfiltergraph: check for sws opts being non-NULL before using them. 
Avoid snprintfing a NULL pointer.

CC: libav-stable@libav.org
 2013-04-03 09:29:55 +02:00
Martin Storsjö 817dff578f configure: Check for the atomic.h functions used in the suncc atomics header 
The "suncc" atomics implementation uses a suncc specific memory
barrier, but also relies on a few atomic functions from atomic.h,
that are not suncc specific but specific to solaris. This made
the current implementation fail on suncc on linux.
 2013-04-03 09:23:04 +02:00
Anton Khirnov f9f6402e9c configure: prettify atomics handling. 
Add simpler names and a shorthand for native atomics (as opposed to
pthreads fallback).
 2013-04-03 09:22:31 +02:00
Michael Niedermayer 83e2217221 flvdec: fix seeking in audio only files 
Fixes Seeking with the file in Ticket2283

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-03 03:57:37 +02:00
Michael Niedermayer aa7d9809c1 h264pred: fix "warning: initialization discards const qualifier from pointer target type" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-03 03:14:09 +02:00
Clément Bœsch e7692a9bac lavfi/edgedetect: reindent after previous commit. 2013-04-03 00:31:19 +02:00
Clément Bœsch e366aec030 lavfi/edgedetect: add direct path. 2013-04-03 00:30:48 +02:00
Michael Niedermayer ccc25378bd avformat: fix atomatic format selection for (s)segment 
Fixes Ticket2236

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-02 21:52:40 +02:00
Michael Niedermayer 356363c898 ffmpeg: Fix forcing of the framerate for stream copy on input 
Fixes Ticket2211

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-02 18:19:23 +02:00
highgod0401 9079359141 deshake opencl based on comments on 20130402 3rd 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-02 15:57:44 +02:00
Michael Niedermayer c09da45ffb dsputil: Fix "warning: initialization discards const qualifier from pointer target type" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-02 14:52:18 +02:00
Paul B Mahol 1de11a7cab libmp3lame: allow joint stereo to be disabled 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-02 12:14:14 +00:00
Michael Niedermayer 4dd31f88f5 cavs: fix "warning: initialization discards const qualifier from pointer target type" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-02 05:12:10 +02:00
Michael Niedermayer 7f4b588fdf ffplay: use seek per time for ogg by default 
Fixes Ticket2383

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-02 01:36:45 +02:00
Stefano Sabatini 064acc9743 lavu/opencl: use consistent inclusion header guard name 2013-04-01 23:54:29 +02:00
Stefano Sabatini 57d77b3963 lavu/opencl: apply misc cosmetics fixes 
Split long lines, reindent code, add missing spaces between operators,
remove possibly confusing comment from av_opencl_buffer_read_image()
doxy, and use designated initializers for openclutils_class.
 2013-04-01 23:54:21 +02:00
Michael Niedermayer 4394528d2d cavsdsp: fix "warning: initialization discards const qualifier from pointer target type" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-01 20:47:48 +02:00
Michael Niedermayer f7a02d5d69 ffmpeg: initialize got_output, this silences a compiler warning from icc 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-01 20:47:48 +02:00
Clément Bœsch 6278bc8a6c lavfi/curves: make use of options to store the preset names. 2013-04-01 20:37:45 +02:00
Clément Bœsch 2208a46f8f cmdutils: fix build with --disable-avfilter. 2013-04-01 19:56:59 +02:00
Michael Niedermayer 599866f5d5 Merge remote-tracking branch 'cigaes/master' 
* cigaes/master:
  lavfi/af_asetnsamples: fix EOF handling.
  lavu/opt: make sure av_opt_set_bin() handles NULL/0.
  lavd/v4l2: fully init an ioctl argument.
  lavfi: detect merge failure for unknown layouts.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-01 15:13:07 +02:00
Michael Niedermayer ce841bc032 Changelog: add entry for OpenCL 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-01 13:32:34 +02:00
Michael Niedermayer 76071322a3 opencl: fix double ; 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-01 13:01:17 +02:00
highgod0401 189cbc1a03 opencl wrapper based on comments on 20130401 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-01 12:52:13 +02:00
Michael Niedermayer 24f822c3ab Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  oma: Validate sample rates

Conflicts:
	libavformat/oma.c

See: a30165c4a8

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-01 12:48:04 +02:00
Nicolas George 52853077ee lavfi/af_asetnsamples: fix EOF handling. 
Only filter one buffered frame.
Correctly return EOF if there is none.
 2013-04-01 10:38:52 +02:00
Nicolas George 983d04dd40 lavu/opt: make sure av_opt_set_bin() handles NULL/0. 2013-04-01 10:38:38 +02:00
Nicolas George 9dd54d7422 lavd/v4l2: fully init an ioctl argument. 
Silence a valgrind warning about uninitialized memory.
 2013-04-01 10:38:14 +02:00
Nicolas George f810ca63f8 lavfi: detect merge failure for unknown layouts. 
Detect when filtering known layouts from an explicit list
results in an empty list.

Fix erratic behavior.
 2013-04-01 10:37:48 +02:00
Derek Buitenhuis 7d05751581 doc: Grammar fixes for strem specifiers section 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-03-31 18:22:09 -04:00
Derek Buitenhuis 0cb2d32453 doc: Fix broken English in the common options description 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-03-31 18:22:09 -04:00
Derek Buitenhuis a034cdf49d doc: Grammar fixes for stream selection 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-03-31 18:22:09 -04:00
Derek Buitenhuis 9db706206d doc: Consistently use 'filtergraph' 
We used to use 'filtergraph' or 'filter graph' randomly.

'filtergraph' was chosen due to having 57 occurrences in
the documentation, whereas 'filter graph' had only 19.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-03-31 18:22:08 -04:00
Derek Buitenhuis 9249b28e79 doc: Grammar fixes for FFmpeg's detailed description 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-03-31 18:22:08 -04:00