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
60,118 Commits 37 Branches 400 Tags 460 MiB
ba15aab4a4
Commit Graph

4141 Commits

Author SHA1 Message Date
Stefano Sabatini
8f1edc73a8 lavfi: rename asrc_aevalsrc.c to aeval.c 
The file now contains both source and filter, the new name looks more
appropriate.
 2013-12-06 10:57:28 +01:00
Stefano Sabatini
e424abc3a0 lavfi: add aeval filter 2013-12-06 10:57:26 +01:00
Stefano Sabatini
405b3eb535 lavfi/aevalsrc: duplicate last expression for the missing channels 
Use last expression for the missing channel expressions in case the
channel layout was specified. Enhance flexibility.
 2013-12-06 10:51:12 +01:00
James Almer
56572787ae Add Windows resource file support for shared libraries 
Originally written by James Almer <jamrial@gmail.com>

With the following contributions by Timothy Gu <timothygu99@gmail.com>

* Use descriptions of libraries from the pkg-config file generation function
* Use "FFmpeg Project" as CompanyName (suggested by Alexander Strasser)
* Use "FFmpeg" for ProductName as MSDN says "name of the product with which the
  file is distributed" [1].
* Use FFmpeg's version (N-xxxxx-gxxxxxxx) for ProductVersion per MSDN [1].
* Only build the .rc files when --enable-small is not enabled.

[1] http://msdn.microsoft.com/en-us/library/windows/desktop/aa381058.aspx

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-05 23:42:07 +01:00
Michael Niedermayer
0cc5011f9a avfilter/vf_pad: fix req_end 
Fixes out of array accesses
Fixes Ticket3190

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-03 04:09:10 +01:00
Stefano Sabatini
d5d51cf04d lavfi/volume: support all channel counts 2013-12-02 23:52:24 +01:00
Michael Niedermayer
975110a85e Revert "vf_yadif: move x86 init code to x86/yadif.c" 
This reverts commit a87b17f328.
This reduces the amount of non LGPL code, making a relicensing to LGPL
easier

Conflicts:

	libavfilter/vf_yadif.c
	libavfilter/x86/yadif.c
	libavfilter/x86/yadif_template.c
	libavfilter/yadif.h

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-01 20:26:26 +01:00
Michael Niedermayer
ab00800cde Revert "yadif: add parens around macro parameters" 
This reverts commit 49e617f956.
This reduces the amount of non LGPL code, making a relicensing to LGPL
easier

Conflicts:

	libavfilter/vf_yadif.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-01 20:26:26 +01:00
Michael Niedermayer
4ef4bb4a20 avfilter/yadif: Revert "lavfi: convert input/ouput list compound literals to named objects" 
This reverts commit 568c70e79e.
This reduces the amount of non LGPL code, making a relicensing to LGPL
easier

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-01 20:26:26 +01:00
James Almer
19e301b9ed lavfi/Makefile: Don't compile lavfutils.c and lswsutils.c if they are not needed 
They are only needed by removelogo.
This fixes a link failure in shared builds when compiling with
removelogo disabled but Lavf/SwS enabled

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-30 13:29:27 +01:00
Michael Niedermayer
ccdfa3e271 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Add missing #includes for *INT64_MAX and *INT64_C

Conflicts:
	ffmpeg.c
	ffmpeg_filter.c
	ffplay.c
	libavformat/assdec.c
	libavformat/avidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-24 05:21:19 +01:00
Diego Biurrun
8f8bc92365 Add missing #includes for *INT64_MAX and *INT64_C 2013-11-23 21:55:52 +01:00
Stefano Sabatini
98786aa2f0 lavfi/aevalsrc: initialize pointer to expression to NULL 
Fix crash in case of expression parsing failure.
 2013-11-21 23:14:38 +01:00
Clément Bœsch
ddaf543aa6 avfilter/showspectrum: use 0 dummies for range in const. 
This is consistent with other options.
 2013-11-20 16:38:09 +01:00
Clément Bœsch
9343fc30e2 avfilter/showspectrum: reindent const options. 2013-11-20 16:37:34 +01:00
Clément Bœsch
9c8b240806 avfilter/showspectrum: add blackman window. 2013-11-20 16:35:48 +01:00
Clément Bœsch
3e69f7c221 avfilter/showspectrum: add win_func option. 2013-11-20 16:22:05 +01:00
Michael Niedermayer
6a71efff33 avfilter/vf_tinterlace: check clone return value 
Inspired by: 3a16ec19d2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-19 18:08:58 +01:00
Michael Niedermayer
0a382aa99b Merge commit '3a16ec19d2426457419cb8a7304f97982699efda' 
* commit '3a16ec19d2426457419cb8a7304f97982699efda':
  vf_interlace: check one av_frame_clone allocation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-19 18:06:40 +01:00
Vittorio Giovara
3a16ec19d2 vf_interlace: check one av_frame_clone allocation 2013-11-19 14:48:36 +01:00
Vallimar
6f5c36832d avfilter/vf_mp: fix missing FF_API_XVMC check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-18 01:22:30 +01:00
Michael Niedermayer
0ee905e243 Merge commit '5b9c3b4505206143d85398c1410949319fa1180f' 
* commit '5b9c3b4505206143d85398c1410949319fa1180f':
  Replace all instances of avcodec_alloc_frame() with av_frame_alloc().

Conflicts:
	doc/examples/decoding_encoding.c
	doc/examples/muxing.c
	ffmpeg.c
	libavcodec/alacenc.c
	libavcodec/libopenjpegenc.c
	libavcodec/libvpxenc.c
	libavcodec/pcm.c
	libavcodec/xbmenc.c
	libavcodec/xwdenc.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-16 23:54:10 +01:00
Alex Sukhanov
86b3435fc0 af_aresample: Fix timestamp of first padded PCM audio packet 
Problem:
ffmpeg generated video file which had two audio packets with the same timestamp: last original audio packet and first padded audio packet.

Timestamp of first added audio packet by 'apad' fitler had the same value as last original audio packet. The problem was in 'aresample' fitler, which used next pts instead of current one.
As long as 'apad' and 'aresample' filters have separate mechanisms of timestamp calculation, they got the same values.

Command line:
ffmpeg -i <input_filename> -shortest -apad 512 -af asetnsamples=n=512 -b:a 1058400 -ac 1 -ar 44100 -async 0 -acodec pcm_s16le -sn -f matroska -y <output_file>

Fix:
Call swr_next_pts() function before swr_convert()

Tested:
FATE tests passed.
Fix has been tested in our Transcoder regression framework on ~10k test videos. It's about ~500k transcodes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-15 11:54:02 +01:00
Stefano Sabatini
8cd3685a3f lavfi: add elbg filter 2013-11-13 11:21:57 +01:00
Clément Bœsch
199b8fbd09 avfilter/fade: use FADE_OUT macro. 2013-11-10 19:16:45 +01:00
Clément Bœsch
981128c2c1 avfilter/fade: remove a bunch of useless parenthesis. 2013-11-10 19:15:48 +01:00
Clément Bœsch
461e810cfc avfilter/fade: use inlink->frame_count. 2013-11-10 19:12:36 +01:00
Clément Bœsch
3e1097b909 avfilter/fade: add color option. 
Fixes Ticket #1822.
 2013-11-10 19:05:08 +01:00
Michael Niedermayer
175e689cc5 avfilter/graphparser: zero filter_ctx in case of deallocation in create_filter() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-07 23:38:44 +01:00
Michael Niedermayer
ec8e68c763 Merge commit 'cffecc0e7ebd642afaa1fb9f56fab1fcc283293c' 
* commit 'cffecc0e7ebd642afaa1fb9f56fab1fcc283293c':
  avfilter/graphparser: Directly free filter memory if initialization fails

Conflicts:
	libavfilter/graphparser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-07 23:05:26 +01:00
Lenny Wang
7c02a77d25 avfilter/unsharp: added optimized opencl kernels 
Reviewed-by: Wei Gao <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-07 22:31:43 +01:00
Paul B Mahol
d9d752cfb5 avfilter/af_aecho: free input frame after it is being used 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-07 17:45:47 +00:00
Michael Niedermayer
ea6331b2c6 avfilter/af_aresample: Calculate output buffer size more precisely. 
Fixes accumulation of data in case of significant silence injections

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-06 23:54:02 +01:00
Diego Biurrun
cffecc0e7e avfilter/graphparser: Directly free filter memory if initialization fails 2013-11-06 22:06:15 +01:00
Lenny Wang
89a3be8921 avfilter/opencl: compile kernels separately 
Reviewed-by: Wei Gao <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-05 14:29:55 +01:00
Michael Niedermayer
be74cb5159 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avfilter/buffer: Suppress deprecation warning for avfilter_unref_buffer

Conflicts:
	libavfilter/buffer.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-05 12:17:35 +01:00
Stefano Sabatini
988e2e7c1c lavfi/ladspa: cast return value of av_x_if_null to char*, fix warnings 2013-11-05 00:04:17 +01:00
Diego Biurrun
7d1a68e95b avfilter/buffer: Suppress deprecation warning for avfilter_unref_buffer 
The function is used in a block of code that is deprecated anyway.
 2013-11-04 23:04:10 +01:00
Diego Biurrun
e73996954d filtfmts-test: Fix use of deprecated API 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2013-11-04 16:20:44 +01:00
Michael Niedermayer
d0ac60730d avfilter/vf_scale: add ov/hsub 
Suggested-by: divVerent
Reviewed-by: Stefano
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-04 15:23:26 +01:00
Vittorio Giovara
446e37dc97 vf_fieldorder: remove superfluous get_video_buffer 2013-11-04 14:37:06 +01:00
Paul B Mahol
3d9fc5c6ad avfilter/vf_aspect: remove dupe constants setup 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-03 16:39:22 +00:00
Michael Niedermayer
2ed562d5fa Merge remote-tracking branch 'cigaes/master' 
* cigaes/master:
  lavfi/af_pan: support unknown layouts on input.
  lavfi/af_pan: support unknown layouts on output.
  lswr: fix assert failure on unknown layouts.
  lavfi: parsing helper for unknown channel layouts.
  lavfi/avfiltergraph: do not reduce incompatible lists.
  lavfi/avfiltergraph: suggest a solution when format selection fails.
  lavd/lavfi: support unknown channel layouts.
  lavf/wavenc: check for a single stream.
  lavd/alsa: add stream validation
  lavd/alsa: fix timestamp calculation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-03 13:57:05 +01:00
Michael Niedermayer
a75bf4e5c1 Merge commit '34a0ac41a880039c7fb4b3abce10d8e2ce48fac7' 
* commit '34a0ac41a880039c7fb4b3abce10d8e2ce48fac7':
  vf_aspect: support variables in evaluating the aspect ratios

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/vf_aspect.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-03 11:54:19 +01:00
Nicolas George
7b0a587393 lavfi/af_pan: support unknown layouts on input. 
Fix trac ticket #2899.
 2013-11-03 10:30:50 +01:00
Nicolas George
4e9adc9b73 lavfi/af_pan: support unknown layouts on output. 2013-11-03 10:30:47 +01:00
Nicolas George
6e2473edfd lavfi: parsing helper for unknown channel layouts. 
Make ff_parse_channel_layout() accept unknown layouts too.
 2013-11-03 10:30:25 +01:00
Nicolas George
d300f5f6f5 lavfi/avfiltergraph: do not reduce incompatible lists. 
A list of "all channel layouts" but not "all channel counts"
can not be reduced to a single unknown channel count.
 2013-11-03 10:30:16 +01:00
Nicolas George
f775eb3fb4 lavfi/avfiltergraph: suggest a solution when format selection fails. 
Format selection can fail if unknown channel layouts are used
with filters that do not support it.
 2013-11-03 10:30:08 +01:00
Rudolf Polzer
3a14b160bd vf_scale: make the dar variable return the DAR. 
Before, it just returned width/height. Correct is width/height*sar.

That way it is consistent with DAR as in probe output and setdar.

Signed-off-by: Rudolf Polzer <divverent@xonotic.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-11-02 21:16:29 +01:00
Rudolf Polzer
34a0ac41a8 vf_aspect: support variables in evaluating the aspect ratios 
Example: -vf setsar=sar="sar*9/10"

Signed-off-by: Rudolf Polzer <divverent@xonotic.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-11-02 21:14:08 +01:00
Michael Niedermayer
599c285162 avfilter/vf_gradfun: add emms_c() for mmxext 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 14:42:06 +01:00
Clément Bœsch
969329fe11 Revert "Merge commit 'ed1a11ed52bbd1f15bb9b0416d69b7924bee3191'" 
This reverts commit fc5fe4804f, reversing
changes made to ffe3350098.

The factoring is broken; it's not calling the ssse3 code anymore, and
calling the mmx2 code with bad alignment. It also broke some FATE
instances.

Conflicts:
	libavfilter/x86/vf_gradfun_init.c
 2013-11-01 14:28:08 +01:00
Michael Niedermayer
c6125f5e1c avfilter/x86/vf_gradfun_init: fix some consts & related warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 14:20:10 +01:00
Michael Niedermayer
fc5fe4804f Merge commit 'ed1a11ed52bbd1f15bb9b0416d69b7924bee3191' 
* commit 'ed1a11ed52bbd1f15bb9b0416d69b7924bee3191':
  gradfun: x86: Factor out common code for some gradfun_filter_line() variants

Conflicts:
	libavfilter/x86/vf_gradfun_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 10:26:49 +01:00
Michael Niedermayer
ffe3350098 Merge commit 'ee80cf741a44115758e62399b7bde08d33161151' 
* commit 'ee80cf741a44115758e62399b7bde08d33161151':
  avfilter: x86: K&R formatting cosmetics

Conflicts:
	libavfilter/x86/vf_gradfun_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 10:20:20 +01:00
Diego Biurrun
ed1a11ed52 gradfun: x86: Factor out common code for some gradfun_filter_line() variants 2013-10-31 16:34:18 +01:00
Diego Biurrun
ee80cf741a avfilter: x86: K&R formatting cosmetics 2013-10-31 12:15:54 +01:00
Carl Eugen Hoyos
e4b0a77021 libavfilter/decimate: Add pts of first frame to all frames. 
Fixes ticket #3019

Reviewed-by: Clément Bœsch
 2013-10-31 11:24:43 +01:00
Michael Niedermayer
325f6e0a97 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavfi: do not export the filters from shared objects

Conflicts:
	libavfilter/af_amix.c
	libavfilter/af_anull.c
	libavfilter/asrc_anullsrc.c
	libavfilter/f_select.c
	libavfilter/f_settb.c
	libavfilter/split.c
	libavfilter/src_movie.c
	libavfilter/vf_aspect.c
	libavfilter/vf_blackframe.c
	libavfilter/vf_colorbalance.c
	libavfilter/vf_copy.c
	libavfilter/vf_crop.c
	libavfilter/vf_cropdetect.c
	libavfilter/vf_drawbox.c
	libavfilter/vf_format.c
	libavfilter/vf_framestep.c
	libavfilter/vf_frei0r.c
	libavfilter/vf_hflip.c
	libavfilter/vf_libopencv.c
	libavfilter/vf_lut.c
	libavfilter/vf_null.c
	libavfilter/vf_overlay.c
	libavfilter/vf_scale.c
	libavfilter/vf_transpose.c
	libavfilter/vf_unsharp.c
	libavfilter/vf_vflip.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-29 11:58:11 +01:00
Anton Khirnov
cd43ca0443 lavfi: do not export the filters from shared objects 2013-10-28 15:29:54 +01:00
Michael Niedermayer
a1ce060c51 Merge commit '5c439b41d0489412c0a4cf6dfb98915251677b8e' 
* commit '5c439b41d0489412c0a4cf6dfb98915251677b8e':
  avfilter: have avfilter_get_by_name return const for next bump

Conflicts:
	libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 13:07:05 +01:00
Vittorio Giovara
884c7a6eb8 avfilter: fix const use of avfilter_next 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-10-28 07:58:23 +01:00
Vittorio Giovara
5c439b41d0 avfilter: have avfilter_get_by_name return const for next bump 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-10-28 07:57:44 +01:00
Paul B Mahol
75b2bbe21d libavfilter/vf_noise: relicense to LGPL 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-27 20:29:07 +00:00
Derek Buitenhuis
52aed19307 avfiltergraph: Properly handle memory allocation failure 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-10-27 19:15:03 +00:00
Paul B Mahol
292902ea9f avfilter: add mergeplanes filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-27 18:58:43 +00:00
Benedict Endemann
696aa74b1a lavfi/overlay: correct small error in intersection detection 
The image size of the destination image was used to determine if a source
image was positioned outside the destination image, that no intersection
could occur.  Actually for these two cases the size of the source image
has to be used!

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-10-27 15:01:02 +01:00
Michael Niedermayer
a826efb55a avfilter/x86/vf_gradfun_init: fix const and related warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-24 12:12:59 +02:00
Michael Niedermayer
1ea28ffc4d Merge commit '0e730494160d973400aed8d2addd1f58a0ec883e' 
* commit '0e730494160d973400aed8d2addd1f58a0ec883e':
  avfilter: x86: Port gradfun filter optimizations to yasm

Conflicts:
	libavfilter/x86/vf_gradfun_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-24 10:35:39 +02:00
Paul B Mahol
426abbb632 avfilter/libmpcodecs/vf_eq: remove useless storage class specifier in empty declaration 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-24 07:44:23 +00:00
Robert Krüger
83922cccb2 avfilter/vf_scale: Correct vf_scale mappings from arguments to color range 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-23 15:44:31 +02:00
Daniel Kang
0e73049416 avfilter: x86: Port gradfun filter optimizations to yasm 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-10-23 14:50:27 +02:00
Michael Niedermayer
f4f8499c19 Merge commit 'f6633c55a3c0e93a5b2bab6aa0692fb608f2a38d' 
* commit 'f6633c55a3c0e93a5b2bab6aa0692fb608f2a38d':
  avfilter: Fix typo in Loren's email address

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-23 12:14:49 +02:00
Diego Biurrun
f6633c55a3 avfilter: Fix typo in Loren's email address 2013-10-23 10:25:14 +02:00
Michael Niedermayer
f94124c23e Merge commit '00d7369de06a16f7c8770a899fcb16bcb94b1e20' 
* commit '00d7369de06a16f7c8770a899fcb16bcb94b1e20':
  vf_fieldorder: log when processing is skipped

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-22 19:26:42 +02:00
Derek Buitenhuis
692b930904 lavfi/pthread: Avoid crashes/odd behavior caused by spurious wakeups 
This is similar to 5152196b2b.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-10-22 17:05:26 +01:00
Derek Buitenhuis
3511d4fc97 pthread: Avoid crashes/odd behavior caused by spurious wakeups 
This is similar to 5152196b2b.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-10-22 13:24:01 +01:00
Vittorio Giovara
00d7369de0 vf_fieldorder: log when processing is skipped 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-10-22 10:58:25 +02:00
Paul B Mahol
c9660999b9 avfilter: replaygain scanner 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-21 19:56:55 +00:00
Michael Niedermayer
ab2bfb85d4 avfilter/ff_insert_pad: fix order of operations 
Fixes out of bounds access
Fixes CID732170
Fixes CID732169

No filter is known to use this function in a way so the issue can be reproduced.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-21 16:43:25 +02:00
Michael Niedermayer
d5ec8ba7f2 Do not leave positive values undefined when negative are defined as error 
Define positive return values as non errors and leave further meaning undefined
This allows future extensions to use these values

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-19 16:42:57 +02:00
Michael Niedermayer
005200887b Merge commit 'eb90a2091ffb94d8c29aaa5ff50f4192520254fc' 
* commit 'eb90a2091ffb94d8c29aaa5ff50f4192520254fc':
  pthread: Fix deadlock during thread initialization

Conflicts:
	libavcodec/pthread.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-14 00:04:52 +02:00
Derek Buitenhuis
eb90a2091f pthread: Fix deadlock during thread initialization 
Sometimes, if pthread_create() failed, then pthread_cond_wait() could
accidentally be called in the worker threads after the uninit function
had already called pthread_cond_broadcast(), leading to a deadlock.

Don't call pthread_cond_wait() if c->done is set.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-10-13 05:50:00 -04:00
Paul B Mahol
cfc9a4c732 avfilter/vsrc_testsrc: smpte(hd)bars: use yuv directly 
Also set color space.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-12 18:40:15 +00:00
Paul B Mahol
1d8ce109e9 avfilter/vf_separatefields: do not reset pts to 0 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-12 15:10:19 +00:00
Michael Niedermayer
aeddc6e3a5 avfilter/lavfutils: fix memleak of avpacket 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-12 11:52:10 +02:00
Michael Niedermayer
eedfee12c6 avfilter/vf_removelogo: fix pixel pointer so it points where its intended 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-12 11:36:55 +02:00
Michael Niedermayer
8c582d1b22 avfilter/vf_removelogo: fix offset for accessing pixels above and below 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-12 11:35:54 +02:00
Michael Niedermayer
8c0687abdf avfilter/vf_removelogo: use av_freep() for saftey 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-12 11:31:38 +02:00
Paul B Mahol
d1d875d301 avfilter/vf_w3fdif: do not reset pts to 0 
Shamelessly stolen from yadif.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-10 15:08:55 +00:00
Michael Niedermayer
0f322feffd avfilter/buffersink: try to fix AV_NOPTS_VALUE 
no testcase available, just found this issue by reading the code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-09 16:33:18 +02:00
Michael Niedermayer
8780f7fbfa avfilter/ff_filter_frame_needs_framing: fix handling of AV_NOPTS_VALUE 
Fixes Ticket3015

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-09 16:33:18 +02:00
Paul B Mahol
162e22e144 avfilter/af_join: remove now unnecessary goto 
Options are freed from the generic code now, there is no need to call
av_opt_free() from the filter.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-08 12:40:33 +00:00
Michael Niedermayer
728bb910ec avfilter/vf_deshake: fix block_contrast() lower brightness value 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-07 22:05:14 +02:00
Lenny Wang
2779b7b30a avfilter/deshake 
The old row index looks weird and wrong to me

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-07 21:39:16 +02:00
Michael Niedermayer
b8866783c6 avfilter/lswsutils: dont override the default scaler 
This should make no difference as this code is only used by removelogo which
seems to refuse to use masks of different size.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-07 13:28:13 +02:00
Paul B Mahol
ad934bc353 avfilter/vf_drawtext: remove dead initialization 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-07 08:40:17 +00:00
Paul B Mahol
ce26a016cd avfilter/vf_phase: remove dead initialization 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-07 08:28:00 +00:00
Michael Niedermayer
3ee796760a avfilter/vf_scale: dont duplicate default. 
use the defaults set by swscale

Suggested-by: stefano
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-06 12:39:47 +02:00