virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Code Issues Releases Activity
49,440 Commits 37 Branches 400 Tags 460 MiB
036b9ee1c9
Commit Graph

2748 Commits

Author SHA1 Message Date
Michael Niedermayer
5068bcda95 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  vf_delogo: fix copying the input frame.

Conflicts:
	libavfilter/vf_delogo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-29 14:58:49 +01:00
Anton Khirnov
7194330bcd vf_delogo: fix copying the input frame. 
CC:libav-stable@libav.org
 2013-01-29 07:33:02 +01:00
Anton Khirnov
f81c37e40f vf_delogo: fix an uninitialized read. 
CC:libav-stable@libav.org
 2013-01-29 07:32:54 +01:00
Michael Niedermayer
1336382c6d avfilter_get_audio_buffer_ref_from_frame: fix handling of >8 channels 
Found-by: inferno@chromium.org
Reported-by: Dale Curtis <dalecurtis@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-28 21:45:16 +01:00
Nicolas George
42c6f2a645 lavfi/vf_drawtext: default to expansion=normal. 2013-01-26 12:52:19 +01:00
Nicolas George
255ae9f380 lavfi: version bump and change log entries after the last commits. 2013-01-26 11:25:21 +01:00
Nicolas George
699b286a21 lavfi/af_anull: accept unknown channel layouts. 2013-01-26 11:15:38 +01:00
Nicolas George
b00502457a lavfi/af_aresample: accept unknown channel layouts. 2013-01-26 11:15:38 +01:00
Nicolas George
6d962aec8d lavfi/af_aformat: accept unknown channel layouts. 2013-01-26 11:15:38 +01:00
Nicolas George
ea645e90a1 lavfi/buffersrc: accept unknown channel layouts. 2013-01-26 11:15:38 +01:00
Nicolas George
19506af788 lavfi/sink_buffer: accept unknown channel layouts. 
Add a field to the AVBufferSinkParams for a list of accepted
channel counts.
Change the default value for the lists in AVBufferSinkParams
to NULL, to let lavfi fill them with something useful.
The fail_enomem path is unneeded because filters are uninited
on failure.
 2013-01-26 11:15:38 +01:00
Nicolas George
b6b2f3433c lavfi: implement ff_query_formats_all(). 2013-01-26 11:15:38 +01:00
Nicolas George
7bb98b753b lavfi: implement ff_all_channel_counts(). 2013-01-26 11:15:38 +01:00
Nicolas George
b6afb2dde1 lavfi: support unknown channel layouts. 2013-01-26 11:15:38 +01:00
Stefano Sabatini
e80be5a0aa lavfi/showwaves: fail in case of push_frame() error 2013-01-25 19:35:21 +01:00
Stefano Sabatini
b7d34b328b lavfi/showwaves: add display mode option and mode=line 2013-01-25 17:42:04 +01:00
Michael Niedermayer
fc2922836b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avfilter: allow setpts filter to use wallclock time for calculations

Conflicts:
	doc/filters.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-25 15:04:41 +01:00
Vladimir Pantelic
0b55b16abc avfilter: allow setpts filter to use wallclock time for calculations 
Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-01-25 10:50:09 +01:00
Paul B Mahol
e65046bf83 lavfi/earwax: remove config_input() 
This is wrong function to check for input parameters.
Function is not needed because query_formats() already
sets supported sample rates.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-24 10:37:44 +00:00
Michael Niedermayer
ac8987591f Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f' 
* commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f':
  Drop DCTELEM typedef

Conflicts:
	libavcodec/alpha/dsputil_alpha.h
	libavcodec/alpha/motion_est_alpha.c
	libavcodec/arm/dsputil_init_armv6.c
	libavcodec/bfin/dsputil_bfin.h
	libavcodec/bfin/pixels_bfin.S
	libavcodec/cavs.c
	libavcodec/cavsdec.c
	libavcodec/dct-test.c
	libavcodec/dnxhdenc.c
	libavcodec/dsputil.c
	libavcodec/dsputil.h
	libavcodec/dsputil_template.c
	libavcodec/eamad.c
	libavcodec/h264_cavlc.c
	libavcodec/h264idct_template.c
	libavcodec/mpeg12.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo.h
	libavcodec/mpegvideo_enc.c
	libavcodec/ppc/dsputil_altivec.c
	libavcodec/proresdsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-23 17:44:56 +01:00
Paul B Mahol
a793a587df lavfi/swapuv: support all planar yuv pixel formats 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-23 16:13:23 +00:00
Stefano Sabatini
5b10c5e7e4 lavfi/showwaves: fix check on showwaves->outpicref 
outpicref is not always in synch with showwaves->outpicref, which is
changed as a side effect of the call to functions.

Fix regression introduced in 5f634480d1,
+10l to me.
 2013-01-22 20:34:29 +01:00
Michael Niedermayer
e4eebc2da9 avf_showwaves: fix null pointer dereference 
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-21 23:00:20 +01:00
Paul B Mahol
6ea8a830e8 afade filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-21 15:20:42 +00:00
Xi Wang
eb553096e5 lavfi: fix null checking in avfilter_config_links() 
Move the first use of `link' after the null pointer check.

Signed-off-by: Xi Wang <xi.wang@gmail.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-21 00:07:00 +01:00
sedacca@comcast.net
24c47f00fe lavfi: EBU R.128 irregular time 
Correct the time interval between logged data rows to the expected
value of 100 milliseconds by naming a new loop counter variable
to be distinct from loop counters for inner loops that
inadvertently change the outer loop operation.

This suggested patch is 1 of 3 for Ticket #2144 "libavfilter ebur128
loudness inaccuracy, irregular time interval, LFE interference".
This suggested patch supersedes the contribution of January 15, 2013
in the thread “[PATCH] lavfi: EBU R.128 irreg time, ch weights, skip
LFE” which combined multiple fixes in one patch.

Reviewed-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-19 03:13:24 +01:00
Paul B Mahol
c79be51dfc vf_fade: use AVPixFmtDescriptor to find out if pixel format have alpha 
Remove alpha_pix_fmts[].

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-18 22:51:05 +00:00
Stefano Sabatini
2852bd704a lavfi/fade: accept shorthand syntax 2013-01-18 23:17:47 +01:00
Paul B Mahol
d084c5c742 vf_fade: support YUVA422P & YUVA444P 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-18 14:35:30 +00:00
Michael Niedermayer
68f92a70f1 Merge commit 'dae1d507af94261bafd3b11549884e5d1eca590e' 
* commit 'dae1d507af94261bafd3b11549884e5d1eca590e':
  x86: Add PAVGB macro to abstract pavgb/pavgusb instruction via cpuflags
  vf_fps: add final flushed frames to the dropped frame count
  rv34_parser: Adjust #if for disabling individual parsers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-16 11:44:45 +01:00
Justin Ruggles
23098bbd50 vf_fps: add final flushed frames to the dropped frame count 2013-01-15 11:26:46 -05:00
Michael Niedermayer
329675cfd7 Merge commit 'a1c525f7eb0783d31ba7a653865b6cbd3dc880de' 
* commit 'a1c525f7eb0783d31ba7a653865b6cbd3dc880de':
  pcx: return meaningful error codes.
  tmv: return meaningful error codes.
  msrle: return meaningful error codes.
  cscd: return meaningful error codes.
  yadif: x86: fix build for compilers without aligned stack
  lavc: introduce the convenience function init_get_bits8
  lavc: check for overflow in init_get_bits

Conflicts:
	libavcodec/cscd.c
	libavcodec/pcx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-14 14:43:32 +01:00
Daniel Kang
67360ccd51 yadif: x86: fix build for compilers without aligned stack 
Manually load registers to avoid using 8 registers on x86_32 with
compilers that do not align the stack (e.g. MSVC).

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-01-14 09:51:52 +01:00
Michael Niedermayer
6f88d2d786 vsrc_testsrc: Fix assignments in if() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-14 05:05:40 +01:00
Paul B Mahol
5b9126ba84 lavfi/gradfun: support YUV440P 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-13 13:23:30 +00:00
Matthieu Bouron
f9eed5d7e6 lavfi/aevalsrc: try to honor specified duration 
If nb_samples divide sample_rate and if nb_samples allow it, aevalsrc
should generate the exact amount of samples according to duration.

Example:
aevalsrc=0::n=480:s=48000:d=5.21 should generate 250080 samples.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-01-12 17:26:35 +01:00
Nicolas George
7e5c5fa5fc lavfi/vf_overlay: check that filter_frame does not return EAGAIN. 
EAGAIN is used internally in the code; it currently does not make
sense as a return code from the next filter.

Should fix CID966655.
 2013-01-10 21:55:02 +01:00
Michael Niedermayer
65b8527993 Merge commit 'f7bf72a4a1146a7583577c9bdc066767e1ba3c6a' 
* commit 'f7bf72a4a1146a7583577c9bdc066767e1ba3c6a':
  idcinvideo: correctly set AVFrame defaults
  yadif: Port inline assembly to yasm
  au: remove unnecessary casts
  au: return AVERROR codes instead of -1

Conflicts:
	libavcodec/idcinvideo.c
	libavfilter/x86/yadif_template.c
	libavformat/au.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-10 12:27:16 +01:00
André Pankratz
0287eea914 lavfi/yadif: fix shorthand/option mismatch 
Fix trac ticket #2128.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-01-10 11:01:14 +01:00
Daniel Kang
899157b308 yadif: Port inline assembly to yasm 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-01-09 18:41:02 +01:00
Nicolas George
ff6b34009d lavfi: fix use-after-free in ff_filter_frame. 
Unlike the original ff_start_frame code, the incoming reference
may be freed before that point.

Fix CID966654.
 2013-01-08 13:31:33 +01:00
Clément Bœsch
caee85bbce lavfi/kerndeint: remove unused pixel_step. 2013-01-06 18:59:15 +01:00
Clément Bœsch
f6659e5c5e lavfi/kerndeint: fix temp buffer linesize. 
Also re-enable the FATE test.
 2013-01-06 18:59:15 +01:00
Michael Niedermayer
e797f22efa vf_tinterlace: fix logical/bit op mixup 
Fixes CID966642

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-06 04:38:53 +01:00
Clément Bœsch
521daf1409 lavfi/kerndeint: get pix format description only once. 
This makes the code faster.
 2013-01-06 04:37:33 +01:00
Clément Bœsch
aaf59766b9 lavfi/avfilter: remove now unused {src,cur,out}_buf. 
This was supposed to be removed in 565e4993, but it was delayed due to
the port of the remaining filters. These buffer ref pointers are not
used anymore, thus dropped.
 2013-01-06 04:14:56 +01:00
Michael Niedermayer
0ef615126f vf_kerndeint: memset buffer to avoid use of uninitialized memory. 
This might fix fate failures.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-06 02:40:44 +01:00
Michael Niedermayer
39d1875455 libavfilter/video.h: remove unused things related to the start/slice/end API 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-05 23:36:09 +01:00
Michael Niedermayer
2468827c06 internal.h: remove start/end_frame from AVFilterPad 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-05 23:36:09 +01:00
Carl Eugen Hoyos
6a9af92565 Allow remaining 32bit RGB packed pix_fmts in kerndeint filter. 
Reviewed-by: Stefano Sabatini
 2013-01-05 14:40:06 +01:00