6a71efff33
avfilter/vf_tinterlace: check clone return value
...
Inspired by: 3a16ec19d2
2013-11-19 18:08:58 +01:00
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
3a16ec19d2
vf_interlace: check one av_frame_clone allocation
2013-11-19 14:48:36 +01:00
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
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
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
8cd3685a3f
lavfi: add elbg filter
2013-11-13 11:21:57 +01:00
199b8fbd09
avfilter/fade: use FADE_OUT macro.
2013-11-10 19:16:45 +01:00
981128c2c1
avfilter/fade: remove a bunch of useless parenthesis.
2013-11-10 19:15:48 +01:00
461e810cfc
avfilter/fade: use inlink->frame_count.
2013-11-10 19:12:36 +01:00
3e1097b909
avfilter/fade: add color option.
...
Fixes Ticket #1822 .
2013-11-10 19:05:08 +01:00
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
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
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
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
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
cffecc0e7e
avfilter/graphparser: Directly free filter memory if initialization fails
2013-11-06 22:06:15 +01:00
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
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
988e2e7c1c
lavfi/ladspa: cast return value of av_x_if_null to char*, fix warnings
2013-11-05 00:04:17 +01:00
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
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
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
446e37dc97
vf_fieldorder: remove superfluous get_video_buffer
2013-11-04 14:37:06 +01:00
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
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
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
7b0a587393
lavfi/af_pan: support unknown layouts on input.
...
Fix trac ticket #2899 .
2013-11-03 10:30:50 +01:00
4e9adc9b73
lavfi/af_pan: support unknown layouts on output.
2013-11-03 10:30:47 +01:00
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
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
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
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
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
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
969329fe11
Revert "Merge commit 'ed1a11ed52bbd1f15bb9b0416d69b7924bee3191'"
...
This reverts commit fc5fe4804fffe3350098
2013-11-01 14:28:08 +01:00
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
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
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
ed1a11ed52
gradfun: x86: Factor out common code for some gradfun_filter_line() variants
2013-10-31 16:34:18 +01:00
ee80cf741a
avfilter: x86: K&R formatting cosmetics
2013-10-31 12:15:54 +01:00
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
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
cd43ca0443
lavfi: do not export the filters from shared objects
2013-10-28 15:29:54 +01:00
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
884c7a6eb8
avfilter: fix const use of avfilter_next
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-10-28 07:58:23 +01:00
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
75b2bbe21d
libavfilter/vf_noise: relicense to LGPL
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-27 20:29:07 +00:00
52aed19307
avfiltergraph: Properly handle memory allocation failure
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-10-27 19:15:03 +00:00
292902ea9f
avfilter: add mergeplanes filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-27 18:58:43 +00:00
Michael Niedermayer
Vittorio Giovara
Vallimar
Alex Sukhanov
Stefano Sabatini
Clément Bœsch
Lenny Wang
Paul B Mahol
Diego Biurrun
Lenny Wang
Nicolas George
Nicolas George
Rudolf Polzer
Carl Eugen Hoyos
Anton Khirnov
Derek Buitenhuis