virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
71,801 Commits 37 Branches 400 Tags 460 MiB
7bab281475
Commit Graph

4969 Commits

Author SHA1 Message Date
Michael Niedermayer
d2184bf3b6 avfilter/lavfutils: disable frame threads when decoding a single image 
The image decoding code does expect the image to be decoded immedeatly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-30 03:48:33 +02:00
Michael Niedermayer
f8fa392a2e avfilter/vf_vignette: force per frame evaluation if per frame variables are used 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-29 23:13:58 +02:00
Michael Niedermayer
a79cbc0b8e avfilter/vf_qp: Fix use of uinitialized variable 
Found-by: <Timothy_Gu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-21 22:54:13 +02:00
Michael Niedermayer
122150168f Merge commit '9b2c57bef5e2f3f61a5fd708ba7d5351f5b3f386' 
* commit '9b2c57bef5e2f3f61a5fd708ba7d5351f5b3f386':
  drawtext: Add an alpha option

Conflicts:
	doc/filters.texi
	libavfilter/vf_drawtext.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-21 20:20:58 +02:00
Michael Niedermayer
8f9a3817d5 avfilter/vf_qp: fix cleanup on error 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-21 14:11:30 +02:00
Luca Barbato
9b2c57bef5 drawtext: Add an alpha option 
And document both `draw` and `alpha`.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-04-21 11:13:30 +02:00
Michael Niedermayer
a6df9ce615 avfilter/buffersrc: Use correct, matching deallocation function 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 12:33:20 +02:00
Michael Niedermayer
0c9e78caf4 Merge commit '617814b4a717b38add5ccb8dd200dbb655f98f09' 
* commit '617814b4a717b38add5ccb8dd200dbb655f98f09':
  buffersrc: Fix resource leak on error

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 12:15:16 +02:00
Michael Niedermayer
40d552dae6 Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8' 
* commit '1a3eb042c704dea190c644def5b32c9cee8832b8':
  Replace av_dlog with normal av_log at trace level

Conflicts:
	ffplay.c
	libavdevice/fbdev_dec.c
	libavfilter/avfilter.c
	libavfilter/internal.h
	libavfilter/setpts.c
	libavfilter/src_movie.c
	libavfilter/vf_crop.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fieldorder.c
	libavformat/assdec.c
	libavformat/avidec.c
	libavformat/flvdec.c
	libavformat/http.c
	libavformat/ipmovie.c
	libavformat/isom.c
	libavformat/mov.c
	libavformat/mpegenc.c
	libavformat/mpegts.c
	libavformat/mpegtsenc.c
	libavformat/mux.c
	libavformat/mxfdec.c
	libavformat/nsvdec.c
	libavformat/oggdec.c
	libavformat/r3d.c
	libavformat/rtspdec.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 03:19:47 +02:00
Federico Tomassetti
617814b4a7 buffersrc: Fix resource leak on error 
Bug-Id: CID 1267902
CC: libav-stable@libav.org
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-04-19 23:50:46 +01:00
Himangi Saraogi
88d1fb4e3f filtfmts: Avoid null pointer dereference 2015-04-19 23:45:35 +01:00
Vittorio Giovara
1a3eb042c7 Replace av_dlog with normal av_log at trace level 
This applies to every library where performance is not critical.
 2015-04-19 12:41:59 +01:00
Nicolas George
38155865df lavfi/avf_showcqt: fix error code. 
Signed-off-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-16 12:38:28 +02:00
Ivan Efimov
2051b401cc avfilter/drawtext: fix frame mem leak 
Signed-off-by: Ivan Efimov <ioefimov@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-14 12:04:52 +02:00
Michael Niedermayer
d5dcd94630 avfilter/vf_scale: Add warning for AVCOL_SPC_YCGCO 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-13 13:45:41 +02:00
Paul B Mahol
d2fc702ace avfilter: add chorus filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-04-11 20:39:43 +00:00
Michael Niedermayer
0773f67395 avfilter/vsrc_life: Fix mix of declarations and statements 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-09 11:40:44 +02:00
Paul B Mahol
a0854c084e avfilter: handle error in query_formats() in bunch of filters 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-04-08 13:05:06 +00:00
Michael Niedermayer
34bddf443c avfilter/af_amix: Use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-06 15:04:38 +02:00
Michael Niedermayer
8a8a1cce6c avfilter/vsrc_mptestsrc: Change enum to int, which is accessed via AVOption as int 
This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-06 14:45:17 +02:00
Michael Niedermayer
ba54512a10 avfilter/vf_mpdecimate: Fix missing () 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-06 02:41:49 +02:00
Michael Niedermayer
0968180f02 avfilter/yadif: Change enums to int, which are accessed via AVOption as int 
This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-05 15:46:11 +02:00
Michael Niedermayer
9caec04a31 avfilter/vsrc_mandelbrot: Change enums to int, which are accessed via AVOption as int 
This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-05 15:44:59 +02:00
Himangi Saraogi
24326930d8 filtfmts: Avoid null pointer dereference 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-03 17:23:45 +02:00
Marton Balint
c84b75c89c vf_drawtext: add support for setting box border width 
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-31 13:41:25 +02:00
Himangi Saraogi
0c9abf2119 avfilter/vf_detelecine: Fix uninitialized array index error 
Fixes the defect CID 1292301

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-31 12:11:17 +02:00
Michael Niedermayer
1019a1cb0a avfilter/vf_vignette: Change enum to int, which is accessed via AVOption as int 
This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-30 21:58:42 +02:00
Michael Niedermayer
984c230cd3 avfilter/vf_transpose: Change enums to int, which are accessed via AVOption as int 
This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-30 00:08:57 +02:00
Michael Niedermayer
8ae350004d avfilter/tinterlace: Change enum to int, which is accessed via AVOption as int 
This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-30 00:08:57 +02:00
Michael Niedermayer
2856634c67 vfilter/vf_qp: Support evaluating expression per MB 
also add support for x/y/w/h parameters

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-28 15:18:58 +01:00
Michael Niedermayer
a8fb8f6112 avfilter/vf_qp: split expression parsing out of loop 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-28 15:17:36 +01:00
Marton Balint
625bd463cd af_channelmap: fix number of channels 
Fixes segfaults with the following command:

ffmpeg -f lavfi -i aevalsrc=0:c=stereo:n=1920 -af 'channelmap=0' test.ac3

Signed-off-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-28 11:16:26 +01:00
Himangi Saraogi
fff7871772 lavfi: add inverse telecine filter 
Approved-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-27 21:34:03 +01:00
Himangi Saraogi
dbce8cdacf avfilter/vf_telecine: Avoid floating point values 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-27 15:52:59 +01:00
Himangi Saraogi
613483dcfb avfilter/vf_telecine: Fix loss of AVFrame properties in output 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-27 02:12:10 +01:00
Himangi Saraogi
1301aa55f6 avfilter/vf_telecine: Fix AV desync by using the first input timestamp 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-26 00:41:54 +01:00
Michael Niedermayer
67ceb42d39 avfilter/vf_stereo3d: Change enum to int, which is accessed via AVOption as int 
This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-23 19:31:17 +01:00
Michael Niedermayer
74097e0902 avfilter/vf_signalstats: Change enum to int, which is accessed via AVOption as int 
This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-22 17:31:34 +01:00
Michael Niedermayer
3a23ec0daa avfilter/vf_setfield: Change enum to int, which is accessed via AVOption as int 
This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-22 17:30:24 +01:00
Michael Niedermayer
aa65ff2adf Merge commit 'cfe64613923a2d47644a87386146ada1f9f6b659' 
* commit 'cfe64613923a2d47644a87386146ada1f9f6b659':
  avfilter: Document avfilter_graph_alloc return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-22 04:03:20 +01:00
Federico Tomassetti
cfe6461392 avfilter: Document avfilter_graph_alloc return value 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-03-21 23:18:15 +01:00
Michael Niedermayer
d6dba15b97 avfilter/vf_mcdeint: Change enums to int, which are accessed via AVOption as int 
This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-20 19:12:57 +01:00
Michael Niedermayer
1a79850a8f avfilter/vf_overlay: Change enums to int, which are accessed via AVOption as int 
This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-20 19:11:58 +01:00
Michael Niedermayer
59c06902e8 avfilter/vf_phase: Change enum to int, which is accessed via AVOption as int 
This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-20 19:09:38 +01:00
arwa arif
9015ca359f lavfi/eq: rework expression evaluation 
In particular, add support for t, pos, n, r parameters, and add an eval
mode option.

Also, partially reword option documentation.

With several major edit by Stefano Sabatini.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2015-03-20 09:41:32 +01:00
Stefano Sabatini
e6547cce72 lavfi/eq: factorize code in process_command() 2015-03-20 09:41:32 +01:00
Martin Vignali
57e8047972 avfilter/vf_pp7: remove unused var 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-20 04:38:52 +01:00
Clément Bœsch
d2009c77fb avfilter/vf_colormatrix: fix yuv420p threading, second try 
Now seems to work fine with different combinations of odd/even heights
and odd/even number of threads.
 2015-03-19 00:03:29 +01:00
Michael Niedermayer
fbb9ef5b17 avfilter/vf_lut3d: Change enum to int, which is accessed via AVOption as int 
This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-18 12:32:56 +01:00
Michael Niedermayer
ee17295d10 avfilter/vf_il: Change enums to int, which are accessed via AVOption as int 
This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-18 12:32:56 +01:00