1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Commit Graph

4822 Commits

Author SHA1 Message Date
Michael Niedermayer
ccccfb59b1 Merge commit '22b985d59c007c4422aefe3ef3fca0aa0daafa9f'
* commit '22b985d59c007c4422aefe3ef3fca0aa0daafa9f':
  hqdn3d: check memory allocations and propagate errors

Conflicts:
	libavfilter/vf_hqdn3d.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 22:43:36 +01:00
Vittorio Giovara
22b985d59c hqdn3d: check memory allocations and propagate errors 2015-01-29 17:33:38 +00:00
Stefano Sabatini
af7b89e08b lavfi: document assumptions about the input and output labels of a filter graph description 2015-01-29 10:12:34 +01:00
Arwa Arif
a21acd554a Fix frame-alignment in PP7
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 04:38:48 +01:00
Michael Niedermayer
a6f9a5d0f6 avfilter/x86/vf_fspp: Fix loop condition for column_fidct()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-28 17:23:27 +01:00
Michael Niedermayer
375a0273ce avfilter/vf_fspp: check count before calling row_idct()
Fixes crash with odd widths

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-28 17:23:27 +01:00
Arwa Arif
622936424c avfilter/vf_fspp: Fix frame-alignment in FSPP
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-28 17:22:54 +01:00
Paul B Mahol
fca50464dc avfilter/vf_colorchannelmixer: use the name 's' for the pointer to the private context
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-01-28 14:39:15 +00:00
Paul B Mahol
67aaa7056d avfilter/avf_avectorscope: use the name 's' for the pointer to the private context
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-01-28 14:34:11 +00:00
Paul B Mahol
6121968a9e avfilter/af_biquads: use the name 's' for the pointer to the private context
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-01-28 14:30:27 +00:00
Paul B Mahol
f27cda48ec avfilter/vf_extractplanes: use the name 's' for the pointer to the private context
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-01-28 14:26:13 +00:00
Paul B Mahol
abcf8610b8 avfitler/vf_il: use the name 's' for the pointer to the private context
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-01-28 14:22:26 +00:00
Paul B Mahol
231bf4d1c2 avfilter/vf_colorbalance: use the name 's' for the pointer to the private context
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-01-28 14:11:30 +00:00
Paul B Mahol
87577f5508 avfilter/vf_telecine: use the name 's' for the pointer to the private context
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-01-28 13:51:18 +00:00
Michael Niedermayer
840570d27b avfilter/vf_mcdeint: avoid uninitilaized fields in AVPacket
This is also simpler

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-28 00:58:03 +01:00
Michael Niedermayer
d3d4d98764 Merge commit '8805589b803fab5f362008306319336ac79a3fa7'
* commit '8805589b803fab5f362008306319336ac79a3fa7':
  libopencv: Rework error handling in parse_iplconvkernel()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27 20:31:51 +01:00
Michael Niedermayer
62a82c66cd Merge commit '728685f37ab333ca35980bd01766c78d197f784a'
* commit '728685f37ab333ca35980bd01766c78d197f784a':
  Add a side data type for audio service type.

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/version.h
	libavutil/frame.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27 18:03:43 +01:00
Vittorio Giovara
8805589b80 libopencv: Rework error handling in parse_iplconvkernel()
Fix 'values' memory leak in case of error.

CC: libav-stable@libav.org
Bug-Id: CID 739879
2015-01-27 15:26:37 +00:00
Stefano Sabatini
afa3c996fe lavfi/lut: apply minor compute_gammaval709() doxy fix 2015-01-27 11:22:45 +01:00
Anton Khirnov
728685f37a Add a side data type for audio service type.
Currently, audio service type is a field in AVCodecContext. However,
side data is more appropriate for this kind of information.
2015-01-27 09:17:48 +01:00
Michael Niedermayer
f5b3257c50 avfilter/vf_eq: mark src as const
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27 01:46:08 +01:00
Michael Niedermayer
530bf8ece6 avfilter/vf_eq: Fix clipping code
Found-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-26 23:46:44 +01:00
Paul B Mahol
e44a4c1f5f avfitler/vf_fieldmatch: fix typo
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-01-26 13:04:53 +00:00
Paul B Mahol
5a919ced0d avfilter/libmpcodecs: remove unused headers
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-01-26 12:14:16 +00:00
Stefano Sabatini
0ca5c4dade lavfi/mp: drop mp=eq and mp=eq2
mp=eq2 was ported to a native libavfilter filter in commit
4c38e960d0.
2015-01-26 11:09:02 +01:00
Paul B Mahol
7ccd625a46 avfilter/vf_eq: fix leak of input frame
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-01-26 09:43:51 +00:00
Arwa Arif
4c38e960d0 avfilter: Port mp=eq/eq2 to lavfi
Code adapted from James Darnley's port
Some fixes from Paul B Mahol <onemda@gmail.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-26 00:14:04 +01:00
Michael Niedermayer
961353d842 avfilter/vf_mcdeint: Set no_bitstream=1
This avoids unneeded writing of the bitstream

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-25 19:00:07 +01:00
Michael Niedermayer
ec28cdedde avfilter/vf_mcdeint: fix gop_size
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-25 16:00:46 +01:00
Michael Niedermayer
fd048e690b avfilter/vf_uspp: fix gop_size
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-25 15:58:28 +01:00
Michael Niedermayer
49456ed606 avfilter/vf_uspp: Use FF_CEIL_RSHIFT() correct rounding of odd w/h
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-25 15:58:18 +01:00
Michael Niedermayer
579795b204 avfilter/af_channelmap: Check for missing argument in get_channel_idx()
Fixes null pointer dereference

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-23 15:03:40 +01:00
Michael Niedermayer
a30fd828ab avfilter/avf_showcqt: use av_malloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-22 13:56:30 +01:00
Michael Niedermayer
f77571f6bb avfilter/drawutils: Check for av_malloc* failures
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-22 13:54:26 +01:00
Michael Niedermayer
c90069c6ba avfilter/drawutils: Use av_malloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-22 13:50:30 +01:00
Michael Niedermayer
fdb9399681 avfilter/vf_showinfo: show timebase & framerate too
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-21 21:21:00 +01:00
Paul B Mahol
7849ce438e avfilter/vf_lenscorrection: support 8bit planar RGB formats
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-01-21 18:05:51 +00:00
Paul B Mahol
f191c98e4d avfilter/af_join: swap av_mallocz_array() args for consistency with the prototype
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-01-20 16:52:30 +00:00
Paul B Mahol
357c6a92bc avfilter/af_join: Use av_mallocz_array()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-01-20 16:45:19 +00:00
Michael Niedermayer
081e117bfe avfilter/af_ashowinfo: Use av_realloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-20 17:00:16 +01:00
Paul B Mahol
be1b8b4da5 fix Makefile: remove ilpack
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-01-20 15:48:43 +00:00
Paul B Mahol
fd33658f86 lavfi: remove mp=ilpack
Filter does not work, asserts here.
scale=interl=1,format=yuv422p should be used instead.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-01-20 15:36:31 +00:00
Michael Niedermayer
5c1a8d3b7d avfilter/vf_idet: factorize av_frame_free(&idet->prev)
Found-by: Pascal Massimino <pascal.massimino@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-19 20:24:03 +01:00
Michael Niedermayer
6c702c3c63 avfilter/avfilter: allow idet like scale to have parameter changes
Fixes assertion failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-19 06:03:57 +01:00
Michael Niedermayer
56a33b232c avfilter/vf_idet: flush internal buffers on parameter changes
This is needed to auto insert the filter by default

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-19 06:03:57 +01:00
Michael Niedermayer
723c37d3b7 avfilter/vf_idet: reduce noisyness if the filter has been auto inserted
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-19 05:14:15 +01:00
Muhammad Faiz
eba5cb2028 avfilter/showcqt: add gamma2 option
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-18 05:15:15 +01:00
Michael Niedermayer
e0623953e1 avfilter/vf_frei0r: fix build with DEBUG enabled
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-17 15:41:23 +01:00
Michael Niedermayer
353cf95f94 avfilter/vf_frei0r: also set AVFilterLink.frame_rate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-17 14:46:21 +01:00
Michael Niedermayer
a46a23d30f avfilter/vf_framepack: Check and update frame_rate
The frame_rate update was missing leaving the output frame rate
wrong.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-16 22:02:52 +01:00