RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
68,458 Commits 36 Branches 392 Tags 305 MiB
Commit Graph

4667 Commits

Author SHA1 Message Date
Carl Eugen Hoyos 836a66eeb0 lavfi/fade: Do not overread input buffer. 
(cherry picked from commit ab3ff19f08)
 2015-05-17 12:46:35 +02:00
Clément Bœsch 3429714f3d avfilter/dctdnoiz: fix slice_h computation 
ceilf() can only work if the reminder of the division is not 0.

This fixes memory errors with for instance:
  ffmpeg -f lavfi -i testsrc=s=800x500 -threads 3 -vf dctdnoiz -frames:v 1 -f null -

(cherry picked from commit eb7efaa924)
 2015-02-12 20:21:56 +01:00
Michael Niedermayer 65074a5dae 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>
(cherry picked from commit a46a23d30f)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-12 17:10:35 +01:00
Paul B Mahol c7a2ac6b6b lavfi: check av_strdup() return value 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
(cherry picked from commit 145a84717b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-09 17:19:10 +01:00
Michael Niedermayer 252ba4a925 avfilter/vf_sab: fix filtering tiny images 
Fixes out of array reads

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9bff052b51)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-09 17:19:10 +01:00
Michael Niedermayer 9f8cdd520b Add FFMPEG_VERSION into the binary libs 
This simplifies identifying from which revision a binary of a lib came from

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 649c158e8c)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-22 03:17:56 +01:00
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
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