generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
72,967 Commits 24 Branches 241 Tags 173 MiB
cf11fd632e
Commit Graph

5012 Commits

Author SHA1 Message Date
Michael Niedermayer
46b64e3098 Revert "avfilter/vf_interlace: more accurate pts calculation" 
This reverts commit df8248f66e.

the revert produces a timebase and timestamps that are more close
to what users expect

Hoped-by: koda
 2014-12-02 18:48:03 +01:00
Michael Niedermayer
59f1f764d6 avfilter/vf_tinterlace: Favor using standard timebases for the output 
Reported-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Inspired by discussion with Kieran Kunhya <kierank@obe.tv>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-02 18:28:06 +01:00
Neil Birkbeck
e4788e9cd9 avfilter/vf_yadif: fix extra leading dup frame when deint=1 
Logic for handling single frame in yadif (0f9f24c9), caused deint=1 (e.g., yadif=0👎1) to output extra duplicate leading frame:

ffmpeg -i fate-suite/ffmpeg-synthetic/vsynth1/%02d.pgm  -vf yadif=0👎1,showinfo -f null -y /dev/null
 [Parsed_showinfo_1 @ 0x1d967d0] n:0 pts:0 pts_time:0 pos:-1 fmt:gray sar:0/1 s:352x432 i:P iskey:1 type:I checksum:E457EEA0 plane_checksum:[E457EEA0] mean:[126] stdev:[46.6]
 [Parsed_showinfo_1 @ 0x1d967d0] n:1 pts:0 pts_time:0 pos:-1 fmt:gray sar:0/1 s:352x432 i:P iskey:1 type:I checksum:E457EEA0 plane_checksum:[E457EEA0] mean:[126] stdev:[46.6]
(Outputs 51 frames)

After patch, vf "yadif=0👎1" behaves correctly (like "yadif=0👎0") and outputs 50 frames, first two:

[Parsed_showinfo_1 @ 0x1e307d0] n:0 pts:0 pts_time:0 pos:-1 fmt:gray sar:0/1 s:352x432 i:P iskey:1 type:I checksum:68E8D1EB plane_checksum:[68E8D1EB] mean:[126] stdev:[46.0]
[Parsed_showinfo_1 @ 0x1e307d0] n:1 pts:2 pts_time:0.04 pos:-1 fmt:gray sar:0/1 s:352x432 i:P iskey:1 type:I checksum:4E674BC7 plane_checksum:[4E674BC7] mean:[125] stdev:[46.0]
(Outputs 50 frames)

Signed-off-by: Neil Birkbeck <neil.birkbeck@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-29 21:59:47 +01:00
Neil Birkbeck
dd5d617956 avfilter/vf_idet: Fixing idet for single-frame inputs. 
Handle single frame inputs similar to yadif (e.g., 0f9f24c9cf and 681e008d06)

Example:
  ffmpeg -r 1 -t 1 -i fate-suite/ffmpeg-synthetic/vsynth1/%02d.pgm  -vf idet,showinfo -f null -y /dev/null

Previously:
  Output file is empty, nothing was encoded (check -ss / -t / -frames parameters if used)
  [Parsed_idet_0 @ 0x36389d0] Repeated Fields: Neither:     0 Top:     0 Bottom:     0

After patch:
  [Parsed_showinfo_1 @ 0x1909810] n:0 pts:0 pts_time:0 pos:-1 fmt:gray sar:0/1 s:352x432 ...
  [Parsed_idet_0 @ 0x18f9bb0] Repeated Fields: Neither:     1 Top:     0 Bottom:     0

Fate looks good.

Signed-off-by: Neil Birkbeck <neil.birkbeck@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-28 23:38:59 +01:00
Kieran Kunhya
96fda42a8f vf_interlace: get rid of useless loads 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-11-27 13:57:50 +01:00
Clément Bœsch
c2ea7069c4 avfilter/signalstats: re-use yuv/yuvu/yuvv vars in diff 2014-11-26 21:29:09 +01:00
Clément Bœsch
9cb1d81a60 avfilter/signalstats: localize a few variables 2014-11-26 21:29:09 +01:00
Clément Bœsch
82dda8e4ea avfilter/signalstats: add threading in compute_sat_hue_metrics 2014-11-26 21:29:09 +01:00
Clément Bœsch
7acbd56a8a avfilter/signalstats: isolate sat hue computation metrics in a function 
This will be useful for the following commit
 2014-11-26 21:29:09 +01:00
Clément Bœsch
9db78a296c avfilter/signalstats: add slice threading for subfilters 2014-11-26 21:29:09 +01:00
Clément Bœsch
fad6865748 avfilter/signalstats: fix repitition/repetition typo 2014-11-26 21:29:09 +01:00
Clément Bœsch
cc5c667eb1 avfilter/signalstats: reindent after previous commit 2014-11-26 21:29:08 +01:00
Clément Bœsch
56b98dfc4f avfilter/signalstats: integrate height loop into subfilters 2014-11-26 21:29:08 +01:00
Clément Bœsch
c7e8f610f2 avfilter/signalstats: remove pointless sub filter init system 2014-11-26 21:29:08 +01:00
Clément Bœsch
b424e67abf avfilter/signalstats: fix different buffers for out frame if burn is enabled 
This was the original intend.
 2014-11-26 21:29:08 +01:00
Michael Niedermayer
ca59b5b6ec avfilter/x86/vf_interlace: remove redundant instructions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-25 12:37:19 +01:00
Michael Niedermayer
3fe3c8abb1 Merge commit 'ca5c3ff90972a5c97aabda2ace57ba72dcd7d83b' 
* commit 'ca5c3ff90972a5c97aabda2ace57ba72dcd7d83b':
  vf_interlace: x86: improve asm performance

Conflicts:
	libavfilter/x86/vf_interlace.asm

See: 05e4b25e9b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-25 12:31:45 +01:00
Michael Niedermayer
ca5c3ff909 vf_interlace: x86: improve asm performance 
4775 decicycles -> 3688 decicycles
 2014-11-25 02:00:06 +00:00
Michael Niedermayer
9146a47600 avfilter/graphparser: Use av_freep(), avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-22 18:56:37 +01:00
Michael Niedermayer
7df2981f04 avfilter/avf_concat: Use av_freep(), avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-22 18:47:26 +01:00
Michael Niedermayer
b9ffafbfcc avfilter/formats: Alloc NULL fmts in SET_COMMON_FORMATS() 
This avoids null pointer dereferences in case memory allocation has failed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-21 22:15:32 +01:00
Michael Niedermayer
75819fafd8 avfilter/formats: free the correct pointer in ADD_FORMAT() 
Also only free it when it was not previously allocated to return to the
state prior to the failing function call

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-21 22:13:44 +01:00
Michael Niedermayer
42f3cb419a Merge commit '863ee8a855b8ce27ffef41479eb66da58763faed' 
* commit '863ee8a855b8ce27ffef41479eb66da58763faed':
  lavfi: clean memory on error in ADD_FORMAT()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-21 22:12:46 +01:00
Vittorio Giovara
863ee8a855 lavfi: clean memory on error in ADD_FORMAT() 
CC: libav-stable@libav.org
Bug-Id: CID 1250334
 2014-11-21 12:27:07 +00:00
Michael Niedermayer
9e526213a2 avfilter/af_volume: Use avpriv_float_dsp_alloc() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-18 12:38:38 +01:00
Michael Niedermayer
aa97223f14 avfilter/af_amix: Use avpriv_float_dsp_alloc() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-18 12:24:16 +01:00
Matthew Oliver
70205f1799 mpcodecs: Use _INLINE guards for inline asm. 
Enabled compilation with compiler without inline asm support.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-17 15:16:34 +01:00
Michael Niedermayer
08ee02deca avfilter/vf_tinterlace: remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-16 01:06:18 +01:00
Clément Bœsch
77204f7366 avfilter/xbr: fix style in FILT4() calls 2014-11-15 22:48:22 +01:00
Clément Bœsch
7eece06934 avfilter/xbr: clarify default "interpolated" pixels assignments 2014-11-15 22:46:19 +01:00
Clément Bœsch
bca3c2cfc0 avfilter/xbr: refactor xbr[234]x into a single function 
No speed difference.
 2014-11-15 22:35:29 +01:00
Clément Bœsch
8bc1553cdb avfilter/xbr: add slice threading 2014-11-15 22:15:32 +01:00
Clément Bœsch
454b714283 avfilter/xbr: add video and filtering flags to options 
Fixes ffmpeg -h filter=xbr
 2014-11-15 21:22:00 +01:00
Clément Bœsch
be96201e5b avfilter/xbr: use function pointers for xbr[234]x 2014-11-15 21:18:18 +01:00
Clément Bœsch
c4fb79a3db avfilter/xbr: remove FATE test entry from @todo 
See 57688aecbd
 2014-11-15 21:13:18 +01:00
Clément Bœsch
9a796f7f18 avfilter/xbr: consistent copyright header 2014-11-15 21:06:13 +01:00
Clément Bœsch
d1529273fb avfilter/xbr: make xbr[234]x a bit more consistent 2014-11-15 21:06:13 +01:00
Clément Bœsch
a99004a926 avfilter/xbr: misc style fixes 2014-11-15 21:01:40 +01:00
Clément Bœsch
fda209b741 avfilter/xbr: simplify left/up conditions 2014-11-15 21:01:40 +01:00
Clément Bœsch
a3c3ee6973 avfilter/xbr: misc cleanup in FILT[234] macros 2014-11-15 21:01:40 +01:00
Clément Bœsch
7e91f77547 avfilter/xbr: refactor src/dst pointers definitions into a macro 2014-11-15 21:01:39 +01:00
Clément Bœsch
18e4bf4f54 avfilter/xbr: refactor the 21 pixels definition into a macro 2014-11-15 21:01:39 +01:00
Clément Bœsch
6bf9786a9b avfilter/xbr: mark source pointers as const 2014-11-15 21:01:36 +01:00
Clément Bœsch
e070484040 avfilter/xbr: simplify width overread checks 2014-11-15 20:31:41 +01:00
Clément Bœsch
55f05ac0f1 avfilter/xbr: use different macro names for each dimension 2014-11-15 20:31:41 +01:00
Clément Bœsch
9f9c741771 avfilter/xbr: avoid unecessary macro redirections 2014-11-15 20:31:41 +01:00
Clément Bœsch
086487b633 avfilter/xbr: localize some filtering variables 2014-11-15 20:31:41 +01:00
Clément Bœsch
08bb6f919c avfilter/xbr: do not pass unchanging r2y to macros 2014-11-15 20:31:41 +01:00
Stefano Sabatini
aea7616d39 lavfi/xbr: remove relicensing notice from copyright header 
The log is good enough for tracking those changes.
 2014-11-15 20:13:53 +01:00
Arwa Arif
a2f05d3337 lavfi : change xBR filter to LGPL 
Hyllian's message : "Hi, Put lgpl on this and use it as you wish. It's free!"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-15 18:54:54 +01:00
Michael Niedermayer
05e4b25e9b avfilter/x86/vf_interlace: rewrite asm 
4775 decicycles -> 3688 decicycles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-15 04:09:03 +01:00
Michael Niedermayer
fb3eb57369 avfilter/tinterlace: add Support for ff_lowpass_line_avx() & ff_lowpass_line_sse2() 
Based-on: 2e1704059a by Kieran Kunhya

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-15 04:02:33 +01:00
Michael Niedermayer
18b46ecc93 avfilter/tinterlace: Move lowpass_line to a separate function and call it through a function pointer 
This permits replacing it by a optimized implementation
Based-on / Idea-from: 2e1704059a by Kieran Kunhya

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-15 03:25:43 +01:00
Michael Niedermayer
9d548fce24 avfilter/tinterlace: split context definition into seperate header so it can be used by future optimizations 
Idea from 2e1704059a from Kieran Kunhya

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-15 03:22:35 +01:00
Michael Niedermayer
f043965cd5 avfilter/vf_tinterlace: fix linesize vs. width 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-15 03:03:58 +01:00
Michael Niedermayer
05e0ea6050 avfilter/vf_tinterlace: Fix output top field first flag for MODE_INTERLACEX2 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-15 02:45:13 +01:00
Michael Niedermayer
6f373d75e8 Merge commit '2e1704059ae8625beda2ffde847ad22c5ba416dc' 
* commit '2e1704059ae8625beda2ffde847ad22c5ba416dc':
  vf_interlace: Add SIMD for lowpass filter

Conflicts:
	libavfilter/vf_interlace.c
	libavfilter/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-15 02:39:49 +01:00
Kieran Kunhya
2e1704059a vf_interlace: Add SIMD for lowpass filter 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-11-15 00:35:31 +01:00
Peter Ross
b186b7131e avfilter/vf_lut: gammaval709() 
See http://www.itu.int/rec/R-REC-BT.709
Item 1.2, overall opto-electronic transfer characteristics at source

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-14 02:55:15 +01:00
Aleksey Vasenev
8349001638 avfilter/vf_tinterlace: fix frame rate 
Signed-off-by: Aleksey Vasenev <margtu-fivt@ya.ru>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-13 22:35:15 +01:00
Aleksey Vasenev
df8248f66e avfilter/vf_interlace: more accurate pts calculation 
Signed-off-by: Aleksey Vasenev <margtu-fivt@ya.ru>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-13 22:35:15 +01:00
Stefano Sabatini
73f74f6b16 lavfi/xbr: apply misc cosmetical fixes 2014-11-10 11:55:53 +01:00
Clément Bœsch
30466cac9d avfilter/xbr: drop yet another x2 reference 2014-11-10 06:34:11 +01:00
Clément Bœsch
937ebb8435 avfilter/xbr: fix filter description field 2014-11-10 06:32:27 +01:00
Clément Bœsch
548a5f7ef6 avfilter/xbr: fix TODO entry 2014-11-10 06:28:44 +01:00
Clément Bœsch
fc0a91e3cd avfilter/xbr: consistent use of @see 2014-11-10 06:26:45 +01:00
Michael Niedermayer
064a237669 avfilter/vf_xbr: Uppercase first letter of context type for consistency 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-10 03:45:00 +01:00
Arwa Arif
19d0949d31 lavfi: add xbr filter xBR 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-10 03:45:00 +01:00
Marton Balint
86476c510e avfilter/avf_showwaves: fix off by one error in loop condition 
It caused segfaults.

Signed-off-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-09 16:44:10 +01:00
Michael Niedermayer
d70e503ebc avfilter/af_aresample: remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 15:58:28 +01:00
Kevin Mitchell
fdf22f973d avfilter/vf_idet: add a repeated field detection 
This can be useful for determining telecine.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-05 12:10:42 +01:00
Michael Niedermayer
09024fe681 avfilter/af_aresample: Limit data per inserted packet 
This avoids creating unwieldy large packets, which is allowed but
does not seem to be a good idea

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-04 17:17:24 +01:00
Michael Niedermayer
97da68172a avfilter/af_aresample: split flushing code out 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-04 17:17:23 +01:00
Michael Niedermayer
898635ad9e avfilter/vf_idet: use exp2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-03 17:22:33 +01:00
Michael Niedermayer
4bbd8f05f7 avfilter/vf_idet: use av_rescale() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-03 17:22:16 +01:00
Michael Niedermayer
5d590d87b3 avfilter/vf_idet: fix rounding of av_dict_set_fxp() 
fixes the remainder overflowing beyond .999

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-03 17:14:29 +01:00
Kevin Mitchell
fe6f5f2908 avfilter/vf_idet: add a "half_life" option for statistics 
This can be useful for videos in which the interlacing pattern changes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-03 16:31:26 +01:00
Michael Niedermayer
013c3eb05c avfilter/vf_drawtext: use gm_time_r() for thread saftey 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-02 19:20:26 +01:00
Kevin Mitchell
ae6118de19 avfilter/idet: add current frame classification to metadata 
Fixes ticket 3832

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-01 18:04:35 +01:00
Kevin Mitchell
2847843868 avfilter/idet: add metadata to "current" frame instead of "next" frame 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-01 18:03:38 +01:00
Michael Niedermayer
4360c6ff61 Merge commit '6b9b42cc5576e1819ad1e29d98940066fd14b2d6' 
* commit '6b9b42cc5576e1819ad1e29d98940066fd14b2d6':
  drawtext: Remove the ifdef for localtime_r

Conflicts:
	libavfilter/vf_drawtext.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-26 03:12:37 +01:00
Martin Storsjö
6b9b42cc55 drawtext: Remove the ifdef for localtime_r 
If it isn't available in the system, we've got a fallback to
the normal localtime function, so normal code can assume it is
available as long as time_internal.h is included.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-10-26 00:14:54 +03:00
Michael Niedermayer
0d96d44c4f avfilter: Read errno before av_log() as the callback from av_log() might affect errno 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-25 13:28:51 +02:00
Michael Niedermayer
1945db1f13 Merge commit 'ac84c1ce24a285f9cf16d4297bce73b1c4a6e435' 
* commit 'ac84c1ce24a285f9cf16d4297bce73b1c4a6e435':
  avfilter: check filter link validity

Conflicts:
	libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-25 03:08:19 +02:00
Vittorio Giovara
ac84c1ce24 avfilter: check filter link validity 
Remove now redundant check.

CC: libav-stable@libav.org
Bug-Id: CID 700371
 2014-10-24 23:42:19 +01:00
Neil Birkbeck
ad5c43bb36 avfilter/vf_idet: Fixes issue with idet not flushing last frame. 
Uses a similar approach as vf_yadif to flush the last frame in idet.

Quick test with 50 frames from vsynth1:
./ffmpeg.old -i fate-suite/ffmpeg-synthetic/vsynth1/%02d.pgm -vf idet -f mp4 -y /dev/null 2>&1  | grep Multi
 (gives) [Parsed_idet_0 @ 0x261ebb0] Multi frame detection: TFF:0 BFF:0 Progressive:48 Undetermined:1

./ffmpeg -i fate-suite/ffmpeg-synthetic/vsynth1/%02d.pgm -vf idet -f mp4 -y /dev/null 2>&1  | grep Multi
 (gives) [Parsed_idet_0 @ 0x35a0bb0] Multi frame detection: TFF:0 BFF:0 Progressive:49 Undetermined:1

Fate tests have been updated.

(In testing, it seems this filter will also need a subsequent patch for single frame input)

Signed-off-by: Neil Birkbeck <neil.birkbeck@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-22 15:07:36 +02:00
Stefano Sabatini
843d7bb3a6 lavfi/concat: accept a single segment 
Simplify scripting operations, so that n=1 is not to be considered as a
special case.
 2014-10-21 13:28:40 +02:00
Stefano Sabatini
7ba2e134fb lavfi/afade: fix cur_sample computation 
Use the correct timebase conversion.
 2014-10-21 13:28:08 +02:00
Michael Niedermayer
2e0ac145d5 Merge commit 'd1afd3e1d6e43f4d37ae147091f270124ac48e04' 
* commit 'd1afd3e1d6e43f4d37ae147091f270124ac48e04':
  vf_format: check input validity

See: ee16e0cacc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-20 22:02:45 +02:00
Kevin Mitchell
ff68ceb1b5 avfilter/vf_idet: add both multiple and single frame detection metadata 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-20 14:52:27 +02:00
Vittorio Giovara
d1afd3e1d6 vf_format: check input validity 
CC: libav-stable@libav.org
 2014-10-20 10:38:38 +01:00
Nicholas Robbins
22cfa1f759 libavfi: added option to vf_perspective to specify transformation by giving destinations of corners of source. 
Signed-off-by: Nicholas Robbins <nickrobbins@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-19 17:59:53 +02:00
Kevin Mitchell
9d51bad625 avfilter/vf_idet: add counts to frame metadata 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-19 15:03:13 +02:00
Michael Niedermayer
733db64ce0 Merge commit '0d989dbfc4bc5bc1d563e967449116a7a9865258' 
* commit '0d989dbfc4bc5bc1d563e967449116a7a9865258':
  af_resample: check av_opt_set_dict return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-18 22:04:36 +02:00
Michael Niedermayer
3a4c22f806 Merge commit '6d96c7ea89600655b1f18a3b12f3f041fa714152' 
* commit '6d96c7ea89600655b1f18a3b12f3f041fa714152':
  vf_showinfo: Forward the av_image_get_linesize error

Conflicts:
	libavfilter/vf_showinfo.c

See: 2aecfd4f20
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-18 21:50:34 +02:00
Michael Niedermayer
0b2f860db5 Merge commit 'f401792595dd7760f531e8a3bd2336e9033bd45a' 
* commit 'f401792595dd7760f531e8a3bd2336e9033bd45a':
  vf_drawtext: Do not leak the mmapped textfile

Conflicts:
	libavfilter/vf_drawtext.c

See: 6956b048d8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-18 21:33:04 +02:00
Vittorio Giovara
0d989dbfc4 af_resample: check av_opt_set_dict return value 
CC: libav-stable@libav.org
Bug-Id: CID 1087076
 2014-10-18 16:15:10 +01:00
Vittorio Giovara
6d96c7ea89 vf_showinfo: Forward the av_image_get_linesize error 
CC: libav-stable@libav.org
Bug-Id: CID 1087086
 2014-10-18 16:15:10 +01:00
Luca Barbato
f401792595 vf_drawtext: Do not leak the mmapped textfile 
And validate its size while at it.

CC: libav-stable@libav.org
Bug-Id: CID 1244189
 2014-10-18 16:15:09 +01:00
Michael Niedermayer
17d16008be Merge commit '6cbbf0592f4f3940aac7f687850d1b726a2ea836' 
* commit '6cbbf0592f4f3940aac7f687850d1b726a2ea836':
  resample: Avoid off-by-1 errors in PTS calcs.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-18 12:47:37 +02:00
Timothy B. Terriberry
6cbbf0592f resample: Avoid off-by-1 errors in PTS calcs. 
The rounding used in the PTS calculations in filter_frame() does
not actually match the number of samples output by the resampler.
This leads to off-by-1 errors in the timestamps indicating gaps and
underruns, even when the input timestamps are all contiguous.

Bug-Id: 753

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-10-18 05:01:59 +02:00
James Almer
864f9326fb x86/vf_noise: move asm code to a separate file 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-10-17 00:44:35 -03:00
Michael Niedermayer
4f1a252fd3 avfilter/vf_noise: Use a separate seed for each plane 
This should reduce the correlation between planes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-16 15:05:17 +02:00
Michael Niedermayer
ed3efbcd0c avfilter/vf_noise: use per component rand_shift 
This allows using different shifts per plane

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-16 15:04:49 +02:00
Michael Niedermayer
aba61b22f7 avfilter/vf_noise: move shift calculation to filter_frame() 
This makes the temporal noise case deterministic with threads

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-16 14:28:47 +02:00
Michael Niedermayer
411be72dcb avfilter/vf_noise: fix high resolution support 
Fixes Ticket4017
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-16 13:23:39 +02:00
Michael Niedermayer
5ee6fb7583 avfilter/vf_pp: add gbrp support 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-14 17:15:56 +02:00
Michael Niedermayer
b8c50becc8 avfilter/vf_pp: support AV_PIX_FMT_GRAY8 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-13 01:56:14 +02:00
Michael Niedermayer
9a460db63b avfilter/vf_pp: add yuv 4:4:0 support 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-12 22:22:39 +02:00
James Almer
59d8050df1 avfilter: remove obsolete FF_API_DRAWTEXT_OLD_TIMELINE cruft 2014-10-12 15:54:58 -03:00
Karl Kiniger
903156aa8a vf_drawtext: add missing clear of pointers after av_expr_free() 
Fixes segfault when using sendcmd with drawtext.

Since LIBAVFILTER_VERSION_MAJOR 5 FF_API_DRAWTEXT_OLD_TIMELINE
evaluates to 0.

Signed-off-by: Karl Kiniger <karl.kiniger@med.ge.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-11 23:16:31 +02:00
Clément Bœsch
abaf4245a1 avfilter: add w/h parameters in timeline 
Fixes Ticket #4008.
 2014-10-07 15:05:50 +02:00
Michael Niedermayer
2d6f31730c avfilter/af_adelay: use av_freep(), do not leave stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-07 13:44:26 +02:00
Derek Buitenhuis
23c9ebffb5 avfilter: Properly check for failed format query 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-10-02 12:22:49 +01:00
Derek Buitenhuis
1dbc3e8ac8 avfilter/aresample: Check for memory alloc failure for out sample rates 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-10-02 12:22:37 +01:00
Paul B Mahol
bfdf0f078a avfilter/signalstats: add more pixel formats 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2014-09-27 07:28:06 +00:00
Reynaldo H. Verdejo Pinochet
a9ea79bb49 libavfilter/af_amix: avoid derreferencing possible null 
ff_all_channel_layouts() might return null on alloc failure.

Fixes CID1241516

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2014-09-26 18:42:39 -03:00
Reynaldo H. Verdejo Pinochet
32288234a2 libavfilter/af_channelmap: avoid derreferencing possible null 
ff_all_channel_layouts() might return null on alloc failure.

Fixes CID1241517

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2014-09-26 18:42:39 -03:00
Reynaldo H. Verdejo Pinochet
e3e051c42c libavfilter/af_join: avoid derreferencing possible null 
ff_all_channel_layouts() might return null on alloc failure.

Fixes CID1241518

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2014-09-26 18:42:39 -03:00
Michael Niedermayer
e927682e1b avfilter/vf_scale: Allow chroma samples to be above and to the left of luma samples 
Found-by: Kierank
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-21 12:24:03 +02:00
Pascal Massimino
7ac6b8cfa7 avfilter/idet: typo fix: PROGRSSIVE -> PROGRESSIVE 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-20 12:09:14 +02:00
Andreas Cadhalpun
739f179dd6 vf_deshake: rename Transform.vector to Transform.vec to avoid compiler confusion 
The token 'vector' is a keyword in the Vector/SIMD Multimedia Extension data types and thus should not be used as a variable name.

This fixes building on powerpc/ppc64el.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-18 00:48:15 +02:00
James Almer
fffc9a077d avfilter: remove obsolete FF_API_FILL_FRAME cruft 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-09-17 15:23:26 -03:00
James Almer
d1c49bcae9 avfilter: remove obsolete FF_API_ACONVERT_FILTER cruft 
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-09-17 07:43:03 +00:00
Clément Bœsch
4b58349bc8 avfilter/ass: add shaping option 
The documentation is mostly based on ass.h public header.
 2014-09-16 21:23:33 +02:00
Clément Bœsch
8a9c5db29e avfilter/ass: better log level mapping 2014-09-16 21:23:33 +02:00
Clément Bœsch
a87527ad67 avfilter/ass: make sure the log level are in available range 2014-09-16 21:23:33 +02:00
James Almer
ad1dadac86 avfilter: remove obsolete FF_API_BUFFERSRC_BUFFER cruft 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-09-15 15:54:06 -03:00
Pascal Massimino
649b7a9946 av_filter/x86/idet: use HADDD where appropriate 
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-09-09 19:02:49 -03:00
Pascal Massimino
e3fd6a3a4e av_filter/x86/idet: MMX/SSE2 implementation of 16bits filter_line() 
tested on http://ps-auxw.de/10bit-h264-sample/10bit-eldorado.mkv
MMX: ~30% faster decoding overall
SSE2:~40% faster

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-09 16:47:22 +02:00
Michael Niedermayer
02946120fc avfilter/vf_cropdetect: Do not check lines or columns twice on black frames 
Idea from patch by: hjiodjf 97xgw46 <jfbvxt@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-09 02:06:17 +02:00
Michael Niedermayer
1b2390e2bc avfilter/af_silenceremove: remove dead code 
Fixes CID1237284

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-06 21:36:56 +02:00
Clément Bœsch
b2c0b80f62 avfilter/ebur128: rework channel weighting definition code 
Should fix CID1194399 (Bad bit shift operation)
 2014-09-06 13:47:59 +02:00
Paul B Mahol
422619646e add silenceremove filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2014-09-05 17:30:57 +00:00
James Darnley
db8970d7b6 vfi/x86/vf_idet: fix incorrect use of paddq 
paddq is an SSE2 instruction so it cannot be used for MMX.

This was probably just a typo because the sums are dwords anyway.

Reviewed-by: Pascal Massimino <pascal.massimino@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-05 12:49:34 +02:00
Pascal Massimino
161fc0f463 avfilter/x86/idet: fix license header (GPL -> LGPL) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-05 12:22:36 +02:00
skal
406a9ccffe avfilter/vf_idet: MMX/MMXEXT/SSE2 implementation of idet's filter_line() 
integration by Neil Birkbeck, with help from Vitor Sessak.
core SSE2 loop by Skal (pascal.massimino@gmail.com)

Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-04 22:19:00 +02:00
Reimar Döffinger
098af26067 vf_deshake: Avoid doing a malloc+free for every single frame. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-09-02 19:20:28 +02:00
Reimar Döffinger
4ea8406e38 vf_deshake: reduce stack usage. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-09-02 19:20:28 +02:00
Reimar Döffinger
6d7aa437e1 vf_drawtext: move "static const" before "struct". 
This is consistent with all other occurrences.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-08-31 10:41:42 +02:00
Reimar Döffinger
c9a4ec7969 lavfi: add const/static const to pix_fmts arrays. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-08-31 10:25:36 +02:00
Michael Niedermayer
0daff3ce76 avfilter/vf_mp: remove incorrect usage of AVFrame.type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-30 12:16:46 +02:00
Reimar Döffinger
d9e2aceb7f Add missing "const" all over the place. 
Only "./configure --enable-gpl" on x86 was tested.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-08-29 18:57:25 +02:00
Clément Bœsch
f888331769 avfilter: add codecview filter 2014-08-24 14:35:11 +02:00
Muhammad Faiz
c82a288f87 avfilter/showcqt: add fontcolor option 2014-08-23 10:01:22 +02:00
Timothy Gu
8495c6086d vidstabutils: improve documentation 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-22 22:19:20 +02:00
Timothy Gu
6e51e746c4 vidstab*: Remove accidentally exported av_2_vs_pixel_format() 
Also correctly namespace other functions in vidstabutils, and decrease
difference from Libav.

Initial-patch-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-22 22:18:46 +02:00
Michael Niedermayer
2bfd4ff16d Merge commit '593aaee953f8b07c141ff115e67bae85ef0350c7' 
* commit '593aaee953f8b07c141ff115e67bae85ef0350c7':
  setpts: Add missing inttypes.h #include for PRId64

Conflicts:
	libavfilter/setpts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-21 21:47:43 +02:00
Stefano Sabatini
aade9884e9 lavfi/apad: fix logic when whole_len or pad_len options are specified 
In particular, allow pad_len and whole_len to have value set to 0, which
means that no padding will be added. Previously a value set to 0 meant
that that the filter had to pad forever.

The new semantics is clearer, also simplifies scripting since the option
value might be automatically computed, so that no checks need to be done
in case it is 0.

The old semantics was never documented and the logic was broken (the
filter was always adding samples indefinitely), so this should not break
backward compatibility.
 2014-08-21 16:59:07 +02:00
Michael Niedermayer
b09ea25fec avfilter/vf_lenscorrection: fix memleak 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-21 13:35:30 +02:00
Diego Biurrun
593aaee953 setpts: Add missing inttypes.h #include for PRId64 
Also convert a debug av_log() to av_dlog().
 2014-08-21 04:18:24 -07:00
Diego Biurrun
11cd727fbd vsrc_movie: Adjust a silly typo from b977b287f6 2014-08-21 04:18:23 -07:00
Michael Niedermayer
32cb6c1fe2 avfilter/vf_lenscorrection: get rid of floats in init code 
The only remaining floats are in the user interface, they are left as they
should not cause a problem in practice

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-21 11:54:30 +02:00
Michael Niedermayer
2450ca0f33 avfilter/vf_lenscorrection: get rid of all floats per frame 
there are some still left for 1 time initialization

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-21 11:42:57 +02:00
Michael Niedermayer
c1b663bc92 avfilter/vf_lenscorrection: get rid of some floats 2014-08-21 11:42:56 +02:00
Clément Bœsch
e298b2f5d6 avfilter/showwaves: align const mode values (cosmetics) 2014-08-20 22:32:06 +02:00
Clément Bœsch
e35fb5add4 avfilter/showwaves: add split_channels option 2014-08-20 22:18:38 +02:00
Clément Bœsch
ba29746feb avfilter/showwaves: split out draw sample code 2014-08-20 22:18:35 +02:00
Clément Bœsch
f2f6d45dbd avfilter/showwaves: add "cline" mode (centered line) 2014-08-20 22:16:50 +02:00
Michael Niedermayer
a5cbff22b2 avfilter/avf_showspectrum: fix colums typo 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-20 18:49:01 +02:00
Stefano Sabatini
cb0524f7a0 lavfi/apad: fix if_( style 2014-08-20 12:35:16 +02:00
Michael Niedermayer
5a22877e9d Merge commit '67a7695c142561fe60f21adffe89c133385d37c9' 
* commit '67a7695c142561fe60f21adffe89c133385d37c9':
  avfilter: Remove unused variable from ff_get_video_buffer()

Conflicts:
	libavfilter/video.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-20 00:23:15 +02:00
Diego Biurrun
67a7695c14 avfilter: Remove unused variable from ff_get_video_buffer() 2014-08-19 09:50:18 -07:00
Diego Biurrun
b977b287f6 vsrc_movie: Avoid a variable indirection in movie_get_frame() 
This avoids an unused variable warning with MSVC since the variable is
only used in a debug mode printf statement.
 2014-08-19 06:22:08 -07:00
Pavel Koshevoy
6380f2e367 avfilter/atempo: Flush all buffered input samples 
Fixes ticket #3829

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-19 12:53:09 +02:00
Timothy Gu
32c712f143 vidstabutils: fix indentation 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-17 11:28:23 +02:00
Reimar Döffinger
a0941c8a2b Use new av_dict_set_int helper function. 
Get rid of the many, slightly differing, implementations
of basically the same thing.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-08-16 14:31:41 +02:00
Michael Niedermayer
65f05eff0a avfilter/lavfutils/ff_load_image: Return error if no frame could be decoded 
Based-on suggestion by JULIAN GARDNER <joolzg@btinternet.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-16 01:34:34 +02:00
Michael Niedermayer
81a663f49e Drop remaining unneeded != NULL 
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-15 22:47:45 +02:00
Michael Niedermayer
fb33bff990 Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39' 
* commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39':
  cosmetics: Write NULL pointer equality checks more compactly

Conflicts:
	cmdutils.c
	ffmpeg_opt.c
	ffplay.c
	libavcodec/dvbsub.c
	libavcodec/dvdsubdec.c
	libavcodec/dvdsubenc.c
	libavcodec/dxa.c
	libavcodec/libxvid_rc.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/rv10.c
	libavcodec/tiffenc.c
	libavcodec/utils.c
	libavcodec/vc1dec.c
	libavcodec/zmbv.c
	libavdevice/v4l2.c
	libavformat/matroskadec.c
	libavformat/movenc.c
	libavformat/sdp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-15 21:00:50 +02:00
Michael Niedermayer
c6c345ea92 Merge remote-tracking branch 'cigaes/master' 
* cigaes/master:
  lavfi/avf_showspectrum: check RDFT context init.
  lavfi/avf_showspectrum: add full frame sliding mode.
  lavfi/avf_showspectrum: use automatic framing.
  lavfi/avf_showspectrum: do not push the frame at EOF.
  lavfi/avf_showspectrum: fix output pts computation.
  lavfi/avf_showspectrum: set output frame rate.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-14 19:42:38 +02:00
Clément Bœsch
37bfeca78c avfilter/select: larger pixel sad computation 2014-08-14 19:11:13 +02:00
Clément Bœsch
10d96d8d66 avfilter/select: re-align a few comments 2014-08-14 18:52:53 +02:00
Nicolas George
638eec2ac3 lavfi/avf_showspectrum: check RDFT context init. 
Fix a segfault with large window size.
 2014-08-14 15:11:39 +02:00
Nicolas George
7c10e32ae5 lavfi/avf_showspectrum: add full frame sliding mode. 2014-08-14 14:59:23 +02:00
Nicolas George
ec33df6045 lavfi/avf_showspectrum: use automatic framing. 
The framework can ensure that each input frame has exactly
the correct number of samples, except the last one.
 2014-08-14 14:59:19 +02:00
Nicolas George
d4de6d4fad lavfi/avf_showspectrum: do not push the frame at EOF. 
It is always identical to the last pushed frame.
The samples in the last incomplete window were ignored,
this is unchanged.
Possible enhancement: pad the last incomplete window with
silence.
 2014-08-14 14:23:59 +02:00
Nicolas George
65b284a4ae lavfi/avf_showspectrum: fix output pts computation. 2014-08-14 14:23:59 +02:00
Nicolas George
a3aaaec891 lavfi/avf_showspectrum: set output frame rate. 2014-08-14 14:23:59 +02:00
Clément Bœsch
c85e0ca68a avfilter/dctdnoiz: add slice threading 2014-08-13 19:32:00 +02:00
Paul B Mahol
e3212bfd14 avfitler/vf_perspective: support slice threading 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2014-08-13 14:04:21 +00:00
James Almer
7cafdfe9c7 lavfi: duplicate ff_log2_tab 
Fixes compilation failures on msvc/icl shared builds

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-13 01:00:38 +02:00
James Almer
744f15b6b3 lavu: rename ff_opencl_set_parameter() to avpriv_opencl_set_parameter() 
It was wrongly being exported and used by libavfilter.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-12 03:49:45 +02:00
Daniel Oberhoff
9f617a14a0 avfilter: ported lenscorrection filter from frei0r 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-12 03:33:30 +02:00
James Almer
6985ef7813 lavfi: stop exporting internal functions 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 04:51:19 +02:00
Michael Niedermayer
36bce999f5 libavfilter/af_amerge: Do not depend on SWR_CH_MAX 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 01:08:46 +02:00
Michael Niedermayer
ce1bb4b75d avfilter/af_pan: Do not use SWR_CH_MAX 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 01:08:45 +02:00
Michael Niedermayer
ced765ceb3 avfilter/af_pan: check if the number of channels where sucessfully set 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 01:08:45 +02:00
Michael Niedermayer
a57ece0cb4 Merge commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8' 
* commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8':
  Bump major versions of all libraries.

Conflicts:
	doc/APIchanges
	libavcodec/version.h
	libavdevice/version.h
	libavfilter/version.h
	libavformat/version.h
	libavutil/version.h
	libswscale/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 00:26:45 +02:00
Michael Niedermayer
3e41d2e612 Merge commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e' 
* commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e':
  Postpone API-incompatible changes until the next bump.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-09 22:19:45 +02:00
Clément Bœsch
d7594beede avfilter/dctdnoiz: remove a few indirections in idcts 
No change in the generated asm.
 2014-08-09 20:34:14 +02:00
Anton Khirnov
1985c2e75c Bump major versions of all libraries. 2014-08-09 16:58:33 +00:00
Anton Khirnov
f4c444e17d Postpone API-incompatible changes until the next bump. 2014-08-09 16:57:10 +00:00
Clément Bœsch
1ba7c6ead2 avfilter/dctdnoiz: use 32-bit (float) operations instead of 64 (double) for DCTs 
This makes the code about 1.5x faster without any noticeable difference
in the output.
 2014-08-08 20:00:14 +02:00
Clément Bœsch
eb16a6d229 avfilter/dctdnoiz: remove forward declarations after previous commit 2014-08-08 20:00:14 +02:00
Clément Bœsch
aaf82dc0fa avfilter/dctdnoiz: make color [de]correlation less clumsy 
This has no impact on overall performance, since the block DCT taking
most of the time anyway.
 2014-08-08 20:00:13 +02:00
Muhammad Faiz
94494dab91 avfilter/showcqt: add and extend tlength and volume options 
Add a tlength option with frequency and timeclamp variable

Add to the volume option support for frequency and timeclamp variable,
   a_weighting, b_weighting and c_weighting functions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-08 18:59:02 +02:00
Clément Bœsch
cec59eb63f avfilter/dctdnoiz: add 8x8 dct and make it the default 
8x8 is about 5x faster than 16x16 on 1080p input. Since a block size of
8x8 makes the filter almost usable (time wise) and it's not obvious if
8x8 or 16x16 is better from a quality PoV (it really depends on the
input and parameters), the filter now defaults to 8x8, and as a result
libavfilter is micro bumped.
 2014-08-07 21:24:12 +02:00
Clément Bœsch
06362ab750 avfilter/dctdnoiz: rewrite [f/i]dct 
This removes the avcodec dependency and make the code almost twice as
fast. More to come.

The DCT factorization is based on "Fast and numerically stable
algorithms for discrete cosine transforms" from Gerlind Plonkaa &
Manfred Tasche (DOI: 10.1016/j.laa.2004.07.015).
 2014-08-07 19:59:07 +02:00
Clément Bœsch
97478ef5fe avfilter/select: fix "t" eval variable comment 2014-08-05 21:15:13 +02:00
Clément Bœsch
eaeb61c3a6 avfilter/select: remove optional avcodec dependency 2014-08-05 21:05:53 +02:00
Clément Bœsch
164b7ccf21 avfilter/mp_decimate: remove avcodec dependency 2014-08-05 21:05:52 +02:00
Clément Bœsch
def03d3439 avfilter/deshake: remove avcodec dependency 2014-08-05 21:05:52 +02:00
Michael Niedermayer
2569227689 avfilter/vf_noise: make constant things const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-05 17:04:13 +02:00
mrskman
6f3e15af84 avfilter/avf_showwaves: New p2p mode for showwaves filter 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-05 14:12:35 +02:00
Michael Niedermayer
71d008ebe4 Merge commit '1ef9e8376466bb1e2c147e47554b94cab9c8b04a' 
* commit '1ef9e8376466bb1e2c147e47554b94cab9c8b04a':
  avcodec: Deprecate dtg_active_format field in favor of avframe side-data

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/mpeg12dec.c
	libavcodec/version.h
	libavfilter/vf_showinfo.c
	libavutil/frame.h
	libavutil/version.h

See: 2a3c36e920
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-04 06:11:34 +02:00
Kieran Kunhya
2a3c36e920 Deprecate AFD field and add AFD as side-data 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-04 05:36:44 +02:00
Kieran Kunhya
1ef9e83764 avcodec: Deprecate dtg_active_format field in favor of avframe side-data 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-08-03 15:43:02 -07:00
Michael Niedermayer
a7e87fef21 avfilter/vf_spp: Use dct->get_pixels() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-03 23:36:01 +02:00
Michael Niedermayer
85aaa4e6d5 Merge commit '072916d903d3a925bcd0c864f12254157cab63c1' 
* commit '072916d903d3a925bcd0c864f12254157cab63c1':
  filtfmts: Replace deprecated uses of AVFilterPad

Conflicts:
	libavfilter/filtfmts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-03 19:35:08 +02:00
Diego Biurrun
072916d903 filtfmts: Replace deprecated uses of AVFilterPad 
Also add missing mem.h header for av_freep().
 2014-08-03 03:23:51 -07:00
Diego Biurrun
c6a1ac2dd9 vf_fps: Replace use of deprecated AVFilterBufferRef by AVFrame 2014-08-03 01:29:43 -07:00
Michael Niedermayer
17fef17f67 avfilter/lavfutils: remove redundant variable init 
Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-02 20:03:10 +02:00
Michael Niedermayer
e85bc9df87 Merge commit 'f0e959481968b6d906931127237ed981b6414f6e' 
* commit 'f0e959481968b6d906931127237ed981b6414f6e':
  af_channelmap: Set the frame channel layout

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-02 04:47:31 +02:00
Michael Niedermayer
dcd984e24d Merge commit '87efaa97ceb0ad5820870855d6df3e569e6eac7e' 
* commit '87efaa97ceb0ad5820870855d6df3e569e6eac7e':
  af_join: Set the output frame format

See: e0dd8cadcc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-02 04:45:26 +02:00
Luca Barbato
f0e9594819 af_channelmap: Set the frame channel layout 
Otherwise the frame would show the first layout matching the
channel count.
 2014-08-02 00:58:21 +02:00
Luca Barbato
87efaa97ce af_join: Set the output frame format 2014-08-02 00:58:21 +02:00
Michael Niedermayer
c87f645a75 Merge commit '52269f48e835a52023656f8330262ae70e6061c4' 
* commit '52269f48e835a52023656f8330262ae70e6061c4':
  Revert "vf_interlace: deprecate lowpass option"

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-01 16:39:28 +02:00
Michael Niedermayer
9e052df86d avfilter/vf_pullup: 2nd try to workaround gcc 4.4.3 bug on arm 
The first try failed to work with some build flags

The gcc version affected is very old and unmaintained AFAIK thus i made no
attempt to report this to the gcc developers.

The workaround is pushed as it may still affect users and does affect one
fate client

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-01 14:17:53 +02:00
Vittorio Giovara
52269f48e8 Revert "vf_interlace: deprecate lowpass option" 
This reverts commit 35b05c5184.
A warning is introduced in case this option is used.
 2014-08-01 13:02:29 +01:00
Michael Niedermayer
fc19edd8f5 avfilter/trim: remove duplicate assignment 
Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-31 20:53:15 +02:00
Michael Niedermayer
6f622e5fcb avfilter/f_select: avoid double->int in debug output 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-30 17:50:35 +02:00
Michael Niedermayer
bcbfb95b0e avfilter/f_select: Set var_values[VAR_KEY] correctly 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-30 17:49:26 +02:00
Michael Niedermayer
887d8d293f avfilter/f_select: avoid using doubles for equals checks and casts to enums 
This might silence some warnings.

Issue found from: a8d803a320
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-30 17:37:09 +02:00
Diego Biurrun
a8d803a320 vf_select: Drop a debug av_log with an unchecked double to enum conversion 
CC: libav-stable@libav.org
 2014-07-29 09:37:01 -07:00
Michael Niedermayer
a06c14a48e avfilter/vf_spp: support setting dct avoptions from the filter graph string 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-28 05:16:03 +02:00
Michael Niedermayer
cab8fc624b avfilter/vf_scale: fix log message category 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-28 05:15:16 +02:00
Michael Niedermayer
e3fac20824 avfilter/vf_spp: use AVDCT 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-27 17:21:40 +02:00
Michael Niedermayer
c0a586d9d5 reintroduce avpriv_dsputil_init() to maintain ABI until next soname bump 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-26 13:21:07 +02:00
Lukasz Marek
f753956252 lavfi/src_movie: minor simplifications 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-24 04:50:32 +02:00
Lukasz Marek
9739255365 lavfi/src_movie: remove frame from priv context 
This variable is used only inside one function.
There is no need to store it in context.

This also may prevent crush by double free frame.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-24 04:48:49 +02:00
Muhammad Faiz
ce385c869c avfilter/biquads: avoid clipping when using floating type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-21 03:48:18 +02:00
Michael Niedermayer
437da3e349 avfilter/vf_owdenoise: use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-21 03:18:56 +02:00
Michael Niedermayer
d9ddbaa924 avfilter/avfilter: use av_malloc(z)_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-19 19:42:46 +02:00
Andrey Utkin
cb8cb85da7 lavfi/drawtext: add alias "expr_int_format" to expansion function "eif" 
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-18 14:24:34 +02:00
Timothy Gu
b64808e9dd kerndeint: remove dead assignments 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-18 04:44:58 +02:00
Michael Niedermayer
3a2d1465c8 Merge commit '2d60444331fca1910510038dd3817bea885c2367' 
* commit '2d60444331fca1910510038dd3817bea885c2367':
  dsputil: Split motion estimation compare bits off into their own context

Conflicts:
	configure
	libavcodec/Makefile
	libavcodec/arm/Makefile
	libavcodec/dvenc.c
	libavcodec/error_resilience.c
	libavcodec/h264.h
	libavcodec/h264_slice.c
	libavcodec/me_cmp.c
	libavcodec/me_cmp.h
	libavcodec/motion_est.c
	libavcodec/motion_est_template.c
	libavcodec/mpeg4videoenc.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/x86/Makefile
	libavcodec/x86/me_cmp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-17 23:27:40 +02:00
Nicolas George
099aff5c42 lavfi: check refcount before merging. 
When merging the formats around the automatically inserted
convert filters, the refcount of the format lists can not be 0.
Coverity does not detect it, and suspects a memory leak,
because if refcount is 0 the newly allocated lists are not
stored anywhere. That gives CIDs 1224282, 1224283 and 1224284.
Lists with refcount 0 are used in can_merge_formats(), so the
asserts can not be moved inside the merge functions.
 2014-07-17 18:12:34 +02:00
Andrey Utkin
e9ff5df0b5 lavfi/drawtext: add fontcolor_expr option 
Allow to dynamically evaluate the font color.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2014-07-17 12:42:56 +02:00
Andrey Utkin
dec87454de lavfi/drawtext: add expansion function eif() 
It evaluates expression and outputs it as integer value, using specified
format.

Address trac ticket #3699.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2014-07-17 11:29:43 +02:00
Marc Jeffreys
a0b71e9f3e avfilter/drawtext: Add basic text shaping using libfribidi 
Fixes ticket #3758

Reviewed-by: Andrey Utkin <andrey.krieger.utkin@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-16 00:40:39 +02:00
Stepan Bujnak
895e92eca0 Blackframe video filter now sets metadata accordingly. 
the libavfilter/vf_blackframe.c filter now not only logs detected
values, but also sets frame metadata. Currently, only `pblack` value is set
but `SET_META` macro has been introduced to ease development in the future.

Signed-off-by: Stepan Bujnak <stepan.bujnak@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-15 23:37:27 +02:00
Andreas Cadhalpun
39a6e02fd4 fix spelling errors 
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-12 22:33:27 +02:00
Michael Niedermayer
c9d64abedf avfilter/vf_decimate: Use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-11 15:32:27 +02:00
Michael Niedermayer
be55518fdb avfilter/vf_deshake: Use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-11 15:30:41 +02:00
Michael Niedermayer
4932b1e8b8 avfilter/vf_libopencv: Use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-11 15:00:49 +02:00
James Almer
ddea3b7106 x86/yadif-10: remove duplicate ABS macro 
And use the x86util ones instead, which are optimized for mmxext/sse2.
About ~1% increase in performance on pre SSSE3 processors.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-10 21:06:51 +02:00
Michael Niedermayer
2d5e9451de Merge commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e' 
* commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e':
  dsputil: Split off pixel block routines into their own context

Conflicts:
	configure
	libavcodec/dsputil.c
	libavcodec/mpegvideo_enc.c
	libavcodec/pixblockdsp_template.c
	libavcodec/x86/dsputilenc.asm
	libavcodec/x86/dsputilenc_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-10 01:22:14 +02:00
Michael Niedermayer
e1f729d977 Merge commit 'd3cfd7aff86ee3d449ca68aba21d67b9b2136a9b' 
* commit 'd3cfd7aff86ee3d449ca68aba21d67b9b2136a9b':
  af_compand: make sure request_frame always outputs at least one frame

See: 6b68e2a43b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 13:48:26 +02:00
Andrew Kelley
d3cfd7aff8 af_compand: make sure request_frame always outputs at least one frame 
This fixes a segmentation fault because request_frame in fifo.c assumes
that the call to ff_request_frame will populate fifo->root.next.
Before, it was possible for request_frame in af_compand to not do this,
resulting in a null pointer access. Now, request_frame in af_compand
always will return at least one frame or an error, as per the API
specifications in avfilter.h for request_frame.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-07-08 07:54:00 +00:00
Michael Niedermayer
14e2406de7 Merge commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3' 
* commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3':
  dsputil: Split off FDCT bits into their own context

Conflicts:
	configure
	libavcodec/Makefile
	libavcodec/asvenc.c
	libavcodec/dnxhdenc.c
	libavcodec/dsputil.c
	libavcodec/mpegvideo.h
	libavcodec/mpegvideo_enc.c
	libavcodec/x86/Makefile
	libavcodec/x86/dsputilenc_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 03:19:06 +02:00
Michael Niedermayer
576ced5530 avfilter/vf_drawtext: Add #if HAVE_UNISTD_H around #include <unistd.h> 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 02:49:13 +02:00
Michael Niedermayer
e592bf3d2f avfilter/vsrc_cellauto: Use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-06 14:35:13 +02:00
Michael Niedermayer
d90ad5b2bb avfilter/vf_vignette: Use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-06 14:34:37 +02:00
Michael Niedermayer
11e4890eeb avfilter/unsharp_opencl: use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-06 14:33:54 +02:00
Clément Bœsch
d5601cf6fc avfilter/haldclut: fix R/B swap in CLUT loading 
Fixes Ticket #3751.
 2014-07-05 19:35:51 +02:00
Stefano Sabatini
85eabd748b lavfi/drawtext: do not allocate FT_Glyph, but keep it in the Glyph structure 
Slightly simplify.
 2014-07-05 11:48:06 +02:00
Leandro Santiago
4582e1162a avfilter/vf_drawtext: fix resource leak 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-03 15:45:15 +02:00
Paul B Mahol
b52c26c66f avfilter: add flanger filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2014-07-03 08:07:42 +00:00
Paul B Mahol
7e8c1f0c38 avfilter/af_aphaser: move wave table generation code into separate file 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2014-07-03 07:34:11 +00:00
Michael Niedermayer
1265247206 avfilter/vf_format: Check pix_fmts before dereferencing it 
Fixes CID1224286

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-03 02:29:49 +02:00
Michael Niedermayer
5ab67340f9 avfilter/avfiltergraph: dont "or" together error codes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-03 02:29:49 +02:00
Stefano Sabatini
462c9ee3ac lavfi/overlay: show incoming frames on debug messages 
This is especially useful to debug queue overflow issues.

Ideally we should be able to set the debug message at the
dualinput/framesync level, but they do not have the information related
to the filter context and the inlink, so cannot access much useful
information.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2014-07-02 18:42:15 +02:00
Michael Niedermayer
581b5f0b9b Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e' 
* commit 'e3fcb14347466095839c2a3c47ebecff02da891e':
  dsputil: Split off IDCT bits into their own context

Conflicts:
	configure
	libavcodec/aic.c
	libavcodec/arm/Makefile
	libavcodec/arm/dsputil_init_arm.c
	libavcodec/arm/dsputil_init_armv6.c
	libavcodec/asvdec.c
	libavcodec/dnxhdenc.c
	libavcodec/dsputil.c
	libavcodec/dvdec.c
	libavcodec/dxva2_mpeg2.c
	libavcodec/intrax8.c
	libavcodec/mdec.c
	libavcodec/mjpegdec.c
	libavcodec/mjpegenc_common.h
	libavcodec/mpegvideo.c
	libavcodec/ppc/dsputil_altivec.h
	libavcodec/ppc/dsputil_ppc.c
	libavcodec/ppc/idctdsp.c
	libavcodec/x86/Makefile
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/dsputil_mmx.c
	libavcodec/x86/dsputil_x86.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-01 15:22:11 +02:00
Michael Niedermayer
a97137e948 avfilter/f_ebur128: Use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-01 03:50:53 +02:00
Muhammad Faiz
46563af79c avfilter/showcqt: adding freetype support 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-30 21:53:14 +02:00
Clément Bœsch
d5f817793e avfilter/overlay: reindent 2014-06-29 13:26:12 +02:00
Clément Bœsch
b18d1b094e avfilter/buffersrc: reindent 2014-06-29 13:26:04 +02:00
Michael Niedermayer
525a165d99 avfilter/vf_pullup: workaround bug in gcc 4.4.3 on ARM 
The gcc version affected is very old and unmaintained AFAIK thus i made no
attempt to report this to the gcc developers.

The workaround is pushed as it may still affect users and does affect one
fate client

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-29 00:52:42 +02:00
Michael Niedermayer
a348f4befe avfilter/x86/vf_pullup: fix "invalid combination of opcode and operands" with nasm 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-28 16:06:00 +02:00
Michael Niedermayer
b8255a4c70 avfilter/x86/vf_pullup: fix old typo 
This makes C and MMX match, no change to fate as the differences where
apparently not sufficient to show up in fate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-25 18:22:48 +02:00
Michael Niedermayer
6dffc8f5aa avfilter/vf_pullup: use ptrdiff_t as stride argument for dsp functions 
This should avoid issues on x86_64

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-25 18:22:31 +02:00
Michael Niedermayer
f364101144 avfilter/vf_deshake: fix macro () 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-24 21:43:40 +02:00
Michael Niedermayer
0ed110133f avfilter/vf_colormatrix: fix macro () 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-24 21:43:40 +02:00
Michael Niedermayer
723550d3ca avfilter/vf_hqx: optimize table init 
5389024880 -> 1389386610 dezicycles

This surely can be optimized more, i just didnt want to cause a slowdown
when trying to make the fate test bitexact.
Further optimization left to ubitux

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-24 03:16:53 +02:00
Michael Niedermayer
236aa4de2a avfilter/vf_hqx: avoid floats 
this likely fixes fate failures

2748170880 -> 5389024880 dezicycles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-24 02:40:50 +02:00
Michael Niedermayer
9b33cdcab2 avfilter/vf_blend: fix macro () 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-22 20:49:00 +02:00
Michael Niedermayer
31f77b46b2 avfilter/unsharp_opencl: fix macro () 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-22 20:48:43 +02:00
Andrey Utkin
3bb4d26a5d drawtext: drop unused draw_glyphs() arg "rgbcolor" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-22 19:52:44 +02:00
Michael Niedermayer
954a38e9bf avfilter/vf_hqx: remove << 0 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-22 05:17:23 +02:00
Michael Niedermayer
d7efafd63a avfilter/vf_hqx: partly fix big endian fate test 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-22 04:55:17 +02:00
Michael Niedermayer
84de3ed795 avfilter/deshake_opencl: fix macro () 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-21 23:11:16 +02:00
Michael Niedermayer
04776cedec avfilter/avf_showspectrum: fix macro () 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-21 23:11:16 +02:00
Clément Bœsch
79198cb65a avfilter/hqx: add some self promotion in doxy. 
This is useful to understand how it's different from the original code.
 2014-06-21 22:34:15 +02:00
Clément Bœsch
4d8fc0e088 avfilter/hqx: unroll the pattern calculation 
Code si smaller, no speed difference.
 2014-06-21 22:32:49 +02:00
Clément Bœsch
ded3c9fd32 avfilter: add hqx filter (hq2x, hq3x, hq4x) 
Partially fixes Ticket #3404 (xbr filter remaining)
 2014-06-21 19:22:55 +02:00
Michael Niedermayer
eb0fc73dcc avfilter/vf_spp: Use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-18 00:07:30 +02:00
Michael Niedermayer
f31fd06713 vf_sab: use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-18 00:07:12 +02:00
Michael Niedermayer
593dc5aed9 Merge commit '5a69ded12aaf2bd3baed5d1d644ef23cfecef87f' 
* commit '5a69ded12aaf2bd3baed5d1d644ef23cfecef87f':
  vf_showinfo: print display transformation values

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-16 12:09:20 +02:00
Christophe Gisquet
9107612818 x86util: add and use RSHIFT/LSHIFT macros 
Those macros take a byte number as shift argument, as this argument
differs between MMX and SSE2 instructions.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-15 13:19:27 +02:00
Vittorio Giovara
5a69ded12a vf_showinfo: print display transformation values 2014-06-14 00:19:14 -04:00
Michael Niedermayer
33834be9c8 avfilter/af_asetnsamples: fix pts handling when timebase and 1/samplerate differ 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-14 04:24:13 +02:00
Michael Niedermayer
0a7ad6bf51 avfilter/formats: Use av_realloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-13 23:15:16 +02:00
Michael Niedermayer
d03eefae4a avfilter/vf_dejudder: Use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-13 23:14:38 +02:00
Michael Niedermayer
263aeb826d avfilter/vf_unsharp: use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-13 23:14:18 +02:00
Michael Niedermayer
1df441eaa8 vfilter/avf_showcqt: fix 'mixed declarations and code' 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-13 20:32:54 +02:00
Muhammad Faiz
0a64fb7fb0 avfilter/avf_showcqt: add option for lower resolution 
Resolution can be 1920x1080 or 960x540.
 2014-06-12 09:16:08 +00:00
Clément Bœsch
0180c46928 avfilter/showcqt: move qsort_sparsecoeff closer to where it belongs 2014-06-11 21:33:09 +02:00
Clément Bœsch
1786cd850f avfilter/showcqt: fix misc style issues 2014-06-11 21:33:09 +02:00
Clément Bœsch
76bce46d8f avfilter: add signalstats filter 
Signed-off-by: Mark Heath <silicontrip@gmail.com>
Signed-off-by: Dave Rice <dave@dericed.com>
Signed-off-by: Clément Bœsch <u@pkh.me>
 2014-06-11 21:17:24 +02:00
Michael Niedermayer
2ffe55a64f avfilter/vf_zoompan: fix mixing of declarations and statements 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-09 17:27:34 +02:00
Paul B Mahol
4b6cb1cc69 Zoom & Pan filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2014-06-09 12:41:33 +00:00
Michael Niedermayer
f240740712 avfilter/af_amix: Use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-07 15:06:14 +02:00
Michael Niedermayer
a62814abf4 avfilter/af_channelmap: Use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-07 15:05:51 +02:00
Michael Niedermayer
1c7ac94cdf avfilter/af_aphaser: Use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-07 15:05:33 +02:00
Michael Niedermayer
867c02acd2 avfilter/avf_showcqt: avoid using fminf() 
The loop with fminf() changes from 18093856 to 17403218 dezicycles (gcc 4.6.3, sandybridge i7)

Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-06 17:20:05 +02:00
Muhammad Faiz
40e938a7ed avfilter: new multimedia filter avf_showcqt.c 
this filter is the same as showspectrum but with constant Q transform,
so frequency is spaced logarithmically
 2014-06-05 14:04:01 +02:00
Tobias Rapp
d76f0c0378 avfilter/bufferqueue: Increase buffer queue size 
Avoid buffer overruns when processing some MOV files with the amerge
filter. Files produced by Adobe Premiere Pro CC have up to one second of audio
not interleaved. With common settings (<= 48kHz) that makes up to 47 frames so
a queue length of 64 makes sense.

Fixes ticket #3510.

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-04 18:41:04 +02:00
Lou Logan
88f2586adb fix various typos 
Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-03 10:58:19 -08:00
Michael Niedermayer
20343cfb51 Merge commit 'ad0fe2f4012031c47268f14b9835088c488e1998' 
* commit 'ad0fe2f4012031c47268f14b9835088c488e1998':
  af_resample: Use avresample_get_out_samples

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-29 01:24:48 +02:00
Luca Barbato
ad0fe2f401 af_resample: Use avresample_get_out_samples 2014-05-28 22:50:55 +02:00
Michael Niedermayer
1853e2cba9 avfilter/formats: Avoid using non public AV_SAMPLE_FMT_NB 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 18:22:09 +02:00
Michael Niedermayer
0d26264fb4 avfilter/vf_drawtext: Avoid using non public AV_PIX_FMT_NB 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 17:52:24 +02:00
Michael Niedermayer
ee0c91cc65 avfilter/vf_telecine: Avoid using non public AV_PIX_FMT_NB 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 17:45:36 +02:00
Michael Niedermayer
515e8aed03 avfilter/vf_transpose: Avoid using non public AV_PIX_FMT_NB 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 17:45:21 +02:00
Michael Niedermayer
e10ac3a12e avfilter/vf_swapuv: Avoid using non public AV_PIX_FMT_NB 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 17:45:07 +02:00
Michael Niedermayer
cfa0ad6eec avfilter/vf_noise: Avoid using non public AV_PIX_FMT_NB 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 17:44:45 +02:00
Michael Niedermayer
1dbc98461b avfilter/vf_mergeplanes: Avoid using non public AV_PIX_FMT_NB 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 17:44:15 +02:00
Michael Niedermayer
c0f8801e47 avfilter/il: Avoid using non public AV_PIX_FMT_NB 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 17:44:02 +02:00
Michael Niedermayer
5feac96fdb avfilter/hflip: Avoid using non public AV_PIX_FMT_NB 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 17:43:46 +02:00
Michael Niedermayer
f3fdc32e2f avfilter/crop: Avoid using non public AV_PIX_FMT_NB 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 17:43:32 +02:00
Michael Niedermayer
64fb19cc99 avfilter/formats: Avoid using non public AV_PIX_FMT_NB 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 17:43:03 +02:00
Michael Niedermayer
a1cb4efd2f Merge commit '7cc4c9f32f446feaec5447e3d097e8147e35f156' 
* commit '7cc4c9f32f446feaec5447e3d097e8147e35f156':
  lavfi/formats: avoid using AV_{PIX,SAMPLE}_FMT_NB

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 03:23:23 +02:00
Michael Niedermayer
cdf6a9441d Merge commit 'a7d070acb55c3ebbdd5e93e3366f32865732b8a3' 
* commit 'a7d070acb55c3ebbdd5e93e3366f32865732b8a3':
  vf_fieldorder: avoid using AV_PIX_FMT_NB

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 03:02:37 +02:00
Michael Niedermayer
de5ec08825 Merge commit '862f33c10ea38ea49fa4188725df5e5246dbd1d8' 
* commit '862f33c10ea38ea49fa4188725df5e5246dbd1d8':
  vf_scale: use the pixfmt descriptor API

Conflicts:
	libavfilter/vf_scale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 02:54:58 +02:00
Michael Niedermayer
a37f2cc579 avfilter/vf_format: fix duplicate ; 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 02:53:17 +02:00
Michael Niedermayer
6e9dbee7c6 Merge commit '45fc73edfe071f9690e8671ed2dc402b1cb02ece' 
* commit '45fc73edfe071f9690e8671ed2dc402b1cb02ece':
  vf_format: rework format list parsing

Conflicts:
	libavfilter/vf_format.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 02:46:56 +02:00
Anton Khirnov
7cc4c9f32f lavfi/formats: avoid using AV_{PIX,SAMPLE}_FMT_NB 
Thatt hardcodes the number of formats into lavfi and will break when a
shared lavu is updated, adding new formats.
 2014-05-26 22:25:47 +02:00
Anton Khirnov
b03b2d86aa buffersrc: avoid using AV_PIX_FMT_NB 
That hardcodes the number of pixel formats into lavfi and will break
when a shared lavu is updated, adding new pixel formats.
 2014-05-26 22:25:41 +02:00
Anton Khirnov
a7d070acb5 vf_fieldorder: avoid using AV_PIX_FMT_NB 
That hardcodes the number of pixel formats into lavfi and will break
when a shared lavu is updated, adding new pixel formats.
 2014-05-26 22:25:26 +02:00
Anton Khirnov
862f33c10e vf_scale: use the pixfmt descriptor API 
Avoid using AV_PIX_FMT_NB, since that hardcodes the number of pixel
formats into lavfi and will break when a shared lavu is updated, adding
new pixel formats.
 2014-05-26 22:24:46 +02:00
Anton Khirnov
45fc73edfe vf_format: rework format list parsing 
Avoid using AV_PIX_FMT_NB, since that hardcodes the number of pixel
formats into lavfi and will break when a shared lavu is updated, adding
new pixel formats.
 2014-05-26 22:22:42 +02:00
Billy Shambrook
308188be34 Add metadata injection to blackdetect 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-24 03:56:42 +02:00
Lukasz Marek
ce051ceefc lavfi/vf_fps: use av_fifo_alloc_array 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-05-20 00:00:44 +02:00
Lukasz Marek
d15db8e413 lavfi/buffersink: use av_fifo_alloc_array 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-05-20 00:00:44 +02:00
Clément Bœsch
11e490334e avfilter/edgedetect: reuse already defined ctx. 2014-05-17 14:16:04 +02:00
Clément Bœsch
bac08cf086 avfilter/vignette: reindent after previous commit. 2014-05-16 06:53:36 +02:00
Clément Bœsch
ed7bc5471b avfilter/vignette: add direct rendering. 2014-05-16 06:53:18 +02:00
Clément Bœsch
8a0ba44e1a vignette: reuse already declared ctx. 2014-05-16 06:48:41 +02:00
Masa Utashiro
491d602283 avfilter/vignette: fix input frame memory leak. 
Fixes Ticket #3642.
 2014-05-16 06:32:26 +02:00
Michael Niedermayer
3af7e7b501 avfilter/vsrc_mandelbrot: use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-15 01:54:36 +02:00
Clément Bœsch
bc2e39c4cc avfilter/lut3d: move the scale calc out of the inner loop. 2014-05-14 07:51:10 +02:00
Michael Niedermayer
6ab37221c8 avfilter/vf_removelogo: use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-14 06:17:27 +02:00
Michael Niedermayer
14e2e40f3b avfilter/vf_hqdn3: use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-14 06:17:05 +02:00
Clément Bœsch
c683e6aa2c build: move ebur128 swr dep to configure. 2014-05-13 23:13:44 +02:00
Michael Niedermayer
3d7218d932 Merge commit '449511740f06a4675b0066730fa45cdb764ffafc' 
* commit '449511740f06a4675b0066730fa45cdb764ffafc':
  build: handle library dependencies in configure

Conflicts:
	common.mak
	configure
	libavdevice/Makefile
	libavfilter/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-13 22:40:32 +02:00
Janne Grunau
449511740f build: handle library dependencies in configure 
Instead of setting FFLIBS in each library Makefile configure
exports FFLIBS-$library in config.mak.
 2014-05-13 20:02:01 +02:00
Michael Niedermayer
b9cce9ee5c avfilter/buffer: Use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-12 12:24:41 +02:00
Michael Niedermayer
e951e04a4a avcodec/buffersrc: use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-12 12:24:25 +02:00
michael
04e140daa2 libmpcodecs/vf_uspp: check avcodec_open() return code 
Fixes CID1135747

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-11 02:13:28 +02:00
Michael Niedermayer
6b9e0bf42f avfilter/vf_removelogo: fix memleak on failure 
Fixes CID751770

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-10 21:29:24 +02:00
Michael Niedermayer
2e55f3e907 avfilter/vf_lut3d: check size in parse_dat() 
Fixes CID1212261
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-10 14:46:58 +02:00
Matt Oliver
3554c2fafc libmpcodecs: Fix compilation due to missing static in suncc. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-09 18:33:55 +02:00
Clément Bœsch
5623a10526 avfilter/phase: make the main loop readable. 2014-05-08 23:58:34 +02:00
Clément Bœsch
5df10150d4 avfilter/phase: add some constness for RO data pointers. 2014-05-08 23:34:51 +02:00
Clément Bœsch
69d72140ac avfilter/phase: add timeline support. 2014-05-08 23:34:51 +02:00
Clément Bœsch
8de600de55 avfilter/phase: avoid a memcpy per frame. 2014-05-08 22:59:47 +02:00
Clément Bœsch
687119aa9d avfilter/phase: do not pass the whole context to analyze_plane(). 
Also make sure the AVFilterContext is only being used for logging by
changing the type to void*
 2014-05-08 22:59:47 +02:00
Clément Bœsch
362ab940fc avfilter/phase: add comment on the context cached frame. 2014-05-08 22:59:47 +02:00
Michael Niedermayer
6c23a85000 avfilter/af_compand: Silence "may be used uninitialized" warning 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-08 06:53:16 +02:00
Lukasz Marek
70b63419ee lavfi: use av_fifo_freep 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-05-07 23:39:47 +02:00
Michael Niedermayer
efbf107f5b avfilter/aeval: silence "may be used uninitialized" warning 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-07 16:15:50 +02:00
Michael Niedermayer
5fc4c00972 avfilter/af_bs2b: Fix incompatible pointer type warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-06 01:01:02 +02:00
Michael Niedermayer
6bd1741231 avfilter/f_select: fix incompatible pointer type warning 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-05 05:51:50 +02:00
Clément Bœsch
7c3941b25c avfilter/lut3d: support 3DLUTSIZE directive for Davinci files. 
Fixes Ticket #2847.
 2014-05-04 10:36:53 +02:00
Michael Niedermayer
6b79ef00fd avfilter/vf_deshake: dont pass the wrong context into the SAD functions 
This fixes pointer type warnings
The context should have been unused so this should not fix any real bug

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-03 22:52:17 +02:00
Michael Niedermayer
00948ff876 avfilter/audio: use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-03 20:08:18 +02:00
Clément Bœsch
d53e87a837 avfilter/edgedetect: update copyright. 2014-05-03 19:10:28 +02:00
Clément Bœsch
365c79bd4e avfilter/edgedetect: reindent after previous commit. 2014-05-03 19:07:14 +02:00
Clément Bœsch
b17e98ded0 avfilter/edgedetect: add a colormix mode. 2014-05-03 19:07:14 +02:00
Clément Bœsch
3f3c3318be avfilter/edgedetect: make processing functions context free. 2014-05-03 18:11:02 +02:00
Carl Eugen Hoyos
4aea0afbbb Remove two duplicated named asm constraints. 
This fixes compilation of libmpcodecs/vf_fspp.c with gcc and
INLINE_ASM_DIRECT_SYMBOL_REFS disabled.
 2014-05-03 17:00:18 +02:00
Michael Niedermayer
681e008d06 vfilter/vf_yadif: fix request_frame after 0f9f24c9 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-03 16:14:32 +02:00
Michael Niedermayer
09725c1d2b avfilter/vf_showinfo: also calculate and show mean and standard deviation 
Fixes Ticket3013

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-03 06:02:42 +02:00
mplayer developers
80dd0aff33 libavfilter/libmpcodecs: sync existing filters with mplayer HEAD (ebcacb8b3ca91ef90acb93785b62fd8c5e5dae41) 
Authors from svn:
cehoyos (2):
      Support playback of JPEG 2000 digital cinema files.
      Add name for image format IMGFMT_440P.

ib (1):
      Get rid of VOCTRL_GUI_NOWINDOW.

Matt Oliver (4):
      Fix libmpcodecs inline asm on ICL.
      Use DECLARE_ALIGNED helper macros.
      Remove some superfluous commas from inline asm for better compatibility.
      Use numeric labels in inline asm for consistency and better     compatibility.

reimar (10):
      Fix bpp calculation for XYZ format.
      Avoid duplicating the mouse autohide code.
      Add NV12/NV21 support to some helper functions.
      Add support for rotating the video via OpenGL.
      Add options to determine where borders will be added when adjusting for aspect.
      Apply forgotten move of apply_border_pos function.
      Extract window creation code to common file.
      Make VDPAU support work again with latest FFmpeg.
      img_format: document why mp_get_chroma_shift does not work for NV12/NV21
      Minor spelling/grammar fixes.

For detailed line by line authorship please see svn log of mplayer
svn://svn.mplayerhq.hu/mplayer/trunk

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-03 02:37:27 +02:00
Michael Niedermayer
0f9f24c9cf avfilter/vf_yadif: fix filtering a single image 
Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-02 02:33:24 +02:00
Michael Niedermayer
154d80eae7 Merge commit '1c0210c7981b6a61043d9171f506b435ff5a1f5e' 
* commit '1c0210c7981b6a61043d9171f506b435ff5a1f5e':
  lavfi: add Bauer stereo-to-binaural audio filter

Conflicts:
	Changelog
	configure
	doc/filters.texi
	libavfilter/Makefile
	libavfilter/allfilters.c
	libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-01 14:14:10 +02:00
ValdikSS
7a0e689c45 lavfi/subtitles: introduce stream_index 
Signed-off-by: ValdikSS <iam@valdikss.org.ru>
 2014-05-01 12:52:33 +02:00
Alessandro Ghedini
1c0210c798 lavfi: add Bauer stereo-to-binaural audio filter 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-05-01 08:00:30 +02:00
Michael Niedermayer
617e866e25 Move av_find_best_pix_fmt_of_2() from avcodec to avutil 
This avoids a dependancy of libavfilter on libavcodec

See Ticket 3592
Fixes Ticket2784

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-30 23:14:05 +02:00
Nicolas George
41334fcab4 lavfi/drawtext: allow to format pts as HH:MM:SS.mmm. 2014-04-29 13:25:59 +02:00
Michael Niedermayer
18af0ce62d avfilter/graphdump: Fix pointer to local outside scope 
Fixes CID1194435
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-28 04:01:50 +02:00
Clément Bœsch
b2cfd1fde7 avfilter/curves: fix resource leaks. 
Fixes CID1206650
 2014-04-27 11:49:13 +02:00
Michael Niedermayer
6956b048d8 avfilter/vf_drawtext: fix resource leaks 
Fixes CID1206649

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-27 03:18:57 +02:00
Lukasz Marek
b217dc91bf lavfi/avfilter: clarify avfilter_graph_get_filter() doxygen 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-26 02:16:56 +02:00
Lukasz Marek
b2682db34c lavfi/avfilter: fix typos in doxgens 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-25 23:49:11 +02:00
Carl Eugen Hoyos
9cc4bc973c Fix vf_eq.c and vf_eq2.c compilation with !HAVE_6REGS. 2014-04-24 17:50:27 +02:00
Michael Niedermayer
2c4862e7a1 avfilter/avcodec: Use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-23 21:13:53 +02:00
Michael Niedermayer
658f5d1f63 avfilter/pthread: Use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 02:40:20 +02:00
Michael Niedermayer
59c7615d58 avfilter/filtfmts: Support dynamically allocated in/outputs 
Fixes crash
Fixes Ticket3468

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-21 11:33:17 +02:00
Michael Niedermayer
6ca0a976b2 Merge commit 'd23fc8846d255e31896453136b4c77bc6d5e873f' 
* commit 'd23fc8846d255e31896453136b4c77bc6d5e873f':
  filtfmts: remove unused lavf include

A include for channel_layout.h, is added otherwise compile would break

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-19 18:30:37 +02:00
Michael Niedermayer
74a8dbe1c4 Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b' 
* commit '58400ac133bcfb6bf8196b4e5208bc178307739b':
  lavfi: name anonymous structs

Conflicts:
	libavfilter/buffersink.c
	libavfilter/f_select.c
	libavfilter/src_movie.c
	libavfilter/vf_drawbox.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_overlay.c
	libavfilter/vf_showinfo.c
	libavfilter/vf_unsharp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-19 18:20:17 +02:00
Vittorio Giovara
d23fc8846d filtfmts: remove unused lavf include 2014-04-19 16:20:57 +02:00
Vittorio Giovara
58400ac133 lavfi: name anonymous structs 2014-04-19 16:20:57 +02:00
Carl Eugen Hoyos
b38910c979 Fix compilation with !HAVE_6REGS. 
Can be tested with:
$ ./configure --cc='cc -m32' --disable-optimizations --enable-pic
 2014-04-19 09:56:01 +02:00
Michael Niedermayer
d340dabb76 avfilter/vf_rotate: make int*90° rotates suck less speedwise 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-19 01:23:23 +02:00
Michael Niedermayer
c9aab1ee7f avfilter/vf_rotate: fix several of by 1 errors 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-19 01:23:14 +02:00
Michael Niedermayer
4ebfb2c5ec avfilter/vf_rotate: fix location of update operation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-19 01:22:42 +02:00
Michael Niedermayer
a47cc877a0 avfilter/vf_rotate: increase fixed point precision 
This ensures int_sins output doesnt have "random" lsbs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-19 01:22:06 +02:00
Michael Niedermayer
443261cbbd Merge commit 'f1b239ec8b38474d31f3bfea1f0b1693774fa432' 
* commit 'f1b239ec8b38474d31f3bfea1f0b1693774fa432':
  drawtext: Add fontconfig support

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

See: 40b7a27bad
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-17 05:15:26 +02:00