ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-21 13:56:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
74,328 Commits 36 Branches 398 Tags 535 MiB
7e9cd99627
Commit Graph

5104 Commits

Author SHA1 Message Date
Paul B Mahol
eea08efc0d avfilter/x86/vf_psnr.asm: split one line of license text into two 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-14 23:54:26 +00:00
James Darnley
bff7242608 avfilter/vf_removegrain: add x86 and x86_64 SSE2 functions 
Speed of all modes increased by a factor between 7.4 and 19.8 largely depending
on whether bytes are unpacked into words.  Modes 2, 3, and 4 have been sped-up
by a factor of 43 (thanks quick sort!)

All modes are available on x86_64 but only modes 1, 10, 11, 12, 13, 14, 19, 20,
21, and 22 are available on x86 due to the number of SIMD registers used.

With a contribution from James Almer <jamrial@gmail.com>
 2015-07-14 23:50:50 +00:00
Michael Niedermayer
522256b374 avfilter/internal: Improve docs about ff_request_frame() 
Reviewed-by: James Darnley <james.darnley@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-15 00:09:14 +02:00
Ronald S. Bultje
ae4c9ddebc vf_psnr: sse2 optimizations for sum-squared-error. 
The internal line accumulator for 16bit can overflow, so I changed that
from int to uint64_t in the C code. The matching assembly looks a little
weird but output looks correct.

(avx2 should be trivial to add later.)

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-14 17:57:14 +02:00
Michael Niedermayer
0ff4953e1b avfilter/vf_ssim: Fix "incompatible pointer type" warnings 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-14 13:29:55 +02:00
Ronald S. Bultje
dfc58584b4 vf_ssim: x86 simd for ssim_4x4xN and ssim_endN. 
Both are 2-2.5x faster than their C counterpart.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-14 05:07:07 +02:00
Ronald S. Bultje
03931ecf71 vf_ssim: remove another obscure double loop. 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-13 02:39:51 +02:00
Ronald S. Bultje
a1f4848049 ssim: refactor a weird double loop. 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-13 02:23:30 +02:00
Paul B Mahol
885afff01c avfilter/vf_w3fdif: implement slice threading 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-12 20:06:03 +00:00
Paul B Mahol
7b07e72abc avfilter/vf_stereo3d: implement slice threading for anaglyph output 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-12 20:05:56 +00:00
Ronald S. Bultje
f353b851b9 vf_ssim: fix s->coefs for yuv with non-4:2:0 subsampling. 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 17:15:42 +02:00
Ronald S. Bultje
3bb58c377b vf_psnr: fix rgb channel order mixup in final log message. 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-11 19:13:57 +02:00
Ronald S. Bultje
9879421f1a vf_psnr: always calculate MSE over full pixel range. 
This makes the output compatible with that of pretty much any other
tool that calculates PSNR.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-11 18:47:05 +02:00
Ronald S. Bultje
c381af77c5 vF_psnr: move set_meta() calls out of loop. 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-11 12:48:58 +02:00
Ronald S. Bultje
0303d43964 vf_psnr: add channel weighting based on chroma subsampling. 
Also add per-channel psnr stream averages to final log message.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-11 04:14:09 +02:00
Michael Niedermayer
8fca37d5f8 avfilter/vf_ssim: Mark constant tables as const 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-10 23:43:21 +02:00
Paul B Mahol
ae55fc82a8 avfilter/vf_removegrain: clip to uint16 instead to uint8 
This is how original filter behaves.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-10 10:50:28 +00:00
Paul B Mahol
91748662bc avfilter: add removegrain 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-08 16:02:34 +00:00
Paul B Mahol
7efe81a813 avfilter/vf_colormatrix: add yuv444p support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-08 05:40:03 +00:00
Paul B Mahol
e658b1036c avfilter/avf_showvolume: make it possible to use current channel number in color expression 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-03 18:43:21 +00:00
Paul B Mahol
c3a5702ebf lavfi: add (a)drawgraph filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-03 18:43:21 +00:00
Paul B Mahol
866404df2d avfilter/vf_lut: fix oversight 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-03 16:58:56 +00:00
Paul B Mahol
c0d676f977 avfilter/af_astats: implement recalculation of stats after each X frames 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-03 16:34:28 +00:00
Paul B Mahol
d3836b603e avfilter/af_astats: export metadata 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-03 16:34:28 +00:00
Michael Niedermayer
8f4cfda972 avutil: add missing bswap include 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-03 13:17:57 +02:00
Paul B Mahol
b74ebd09c7 avfilter/vf_lut: >8 bit depth planar yuv support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-03 09:29:06 +00:00
Paul B Mahol
96953e2ef6 avfilter/vf_mpdecimate: remove packed formats 
Packed formats are not supported.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-02 15:36:00 +00:00
Paul B Mahol
7ff5a345a4 avfilter: use AVFILTER_DEFINE_CLASS() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-02 15:36:00 +00:00
Paul B Mahol
17e6d7b400 avfilter/vf_extractplanes: use faster path for input formats with only one component 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-01 17:19:52 +00:00
Paul B Mahol
fc40cdbf49 avfilter/vf_extractplanes: rename misleading variable 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-01 17:19:52 +00:00
Paul B Mahol
be35b8b9a9 avfilter/vf_extractplanes: support more pixel formats 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-01 17:19:52 +00:00
Vittorio Giovara
0d449c81b3 lavfi: Add library identifier 2015-07-01 00:13:58 +01:00
Paul B Mahol
185e76976e avfilter/vf_ssim: fix some cosmetics issues 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-06-30 02:52:33 +00:00
Michael Niedermayer
0083c16605 avfilter/vf_transpose: Fix rounding error 
Fixes out of array access
Fixes: asan_heap-oob_7f875d_3482_cov_1818465256_ssudec.mov

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-30 16:02:09 +02:00
Paul B Mahol
9842d6707f avfilter/avf_showvolume: optionally display channel names 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-06-29 07:53:56 +00:00
Paul B Mahol
f76d7d4b01 avfilter: add showvolume filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-06-28 14:33:36 +00:00
Paul B Mahol
5a1f785249 avfilter: add ssim filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-06-24 14:04:40 +00:00
Michael Niedermayer
f399f826ee Merge commit 'c060d046aa2f89c0e601a2dcfbce53f0e36cf498' 
* commit 'c060d046aa2f89c0e601a2dcfbce53f0e36cf498':
  af_resample: Set the number of samples in the last frame

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-21 20:55:23 +02:00
Simon Thelen
7cbb52ecab libavfilter/formats: Fix parsing of channel specifications with a trailing 'c'. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-20 19:51:14 +02:00
Michael Niedermayer
50ee17340b avfilter/formats: Add test for ff_parse_channel_layout() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-20 14:26:34 +02:00
Luca Barbato
c060d046aa af_resample: Set the number of samples in the last frame 
Otherwise trailing zeroes would appear.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-06-20 12:18:01 +03:00
Paul B Mahol
eb85060b84 avfilter/af_afade: add couple of more curves 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-06-15 20:55:05 +00:00
Paul B Mahol
20ee65ef73 avfilter/af_afade: use av_clipd() instead of nested FFMAX & FFMIN 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-06-14 17:08:43 +00:00
Clément Bœsch
1dee7a31e0 avfilter: bump minor after colorkey addition 2015-06-14 11:20:47 +02:00
Timo Rothenpieler
f17d973413 avfilter/vf_colorkey: Add colorkey video filter 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-14 01:04:14 +02:00
Michael Niedermayer
a98d4d5207 avfilter/drawutils: Assert av_pix_fmt_desc_get() return value in ff_fill_line_with_color() 
Theres currently no case where this could be triggered

Found-by: Daemon404
Reviewed-by: Nicolas George <george@nsup.org>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-13 21:33:18 +02:00
Clément Bœsch
8978052869 avfilter/lut3d: assert on pixel format descriptor 
inlink->format is supposed to be set to a valid format controlled by query_formats().
 2015-06-13 20:51:43 +02:00
Clément Bœsch
a056636c81 avfilter/geq: assert on pixel format descriptor 
inlink->format is supposed to be set to a valid format controlled by query_formats().
 2015-06-13 20:51:43 +02:00
Michael Niedermayer
e0db41316a avfilter/drawutils: Fix format validity check in ff_draw_init() 
Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-13 00:06:28 +02:00
Paul B Mahol
cfe8a89b00 avfilter/vf_zoompan: support planar rgb pixel formats 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-06-12 17:15:20 +00:00
Clément Bœsch
40cc3be73c avfilter: fix a few 5 spaces indent 2015-06-07 20:18:15 +02:00
Ganesh Ajjanagadde
42db4aaaa6 vf_colormatrix: calculate coefficients only once 
calc_coefficients is no longer being called every frame

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-07 00:56:32 +02:00
Carl Eugen Hoyos
3b4e694ead lavfi/tinterlace: Double aspect ratio for modes merge and pad. 2015-06-04 17:03:29 +02:00
Paul B Mahol
b8c0cf7880 avfilter/vf_blend: add linearlight and glow mode 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-06-03 12:40:09 +00:00
Paul B Mahol
3e04746ec3 avfilter/vf_blend: add hardmix mode 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-06-02 19:12:45 +00:00
Paul B Mahol
20cea0c7de avfilter/vf_blend: fix vividlight blend mode 
Pointed-out-by: Rudolf Polzer
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-06-02 18:55:24 +00:00
Paul B Mahol
ac973926b8 avfilter/vf_blend: clip result for divide blend mode 
Pointed-out-by: Rudolf Polzer
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-06-02 18:48:32 +00:00
James Almer
c16e99e3b3 x86: check for AV_CPU_FLAG_AVXSLOW where useful 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 00:15:35 +02:00
Peter Cordes
3ad3529b56 avfilter/vf_mpdecimate: add comment about 8x8 SAD 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-31 13:58:55 +02:00
Peter Cordes
6590acf0fd avfilter/vf_mpdecimate: support more pixel formats, including GBRP 
Add some planar formats we can handle without distorting the meaning of
hi and lo.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-31 13:58:50 +02:00
Peter Cordes
50f112c915 avfilter/vf_mpdecimate: debug logging of threshold stats 
It's often really helpful to know why a frame wasn't decimated (lo or
hi), and how much you exceeded the threshold by, if you're trying to
tweak the thresholds to get what you want.

mpdecimate already prints a line per input frame with -v debug, this
just makes it longer.

Signed-off-by: Peter Cordes <peter@cordes.ca>
 2015-05-31 13:25:40 +02:00
Peter Cordes
fb1be6303d avfilter/vf_mpdecimate: pass the same AVClass context as use elsewhere to av_pixelutils_get_sad_fn() 
Signed-off-by: Peter Cordes <peter@cordes.ca>
 2015-05-31 12:55:23 +02:00
James Almer
d68c05380c x86: check for AV_CPU_FLAG_AVXSLOW where useful 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-05-31 12:07:11 +02:00
Michael Niedermayer
03637762d9 avfilter/vf_fade: Force alpha pixel format if alpha is set to 1 
Fixes Ticket4321

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-31 04:31:28 +02:00
Michael Niedermayer
52fc3e372f avfilter/x86/vf_hqdn3d: Fix register types 
Fixes Ticket4301

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-27 05:18:55 +02:00
Michael Niedermayer
4240e6a921 avfilter/vf_hqdn3d: Initialize the whole LUT 
With bps > 8 more than 255..255 are used
The initialized table content is left unchanged,
But it could also be adjusted for the slight difference of
the maximum

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-27 05:18:55 +02:00
Michael Niedermayer
5bc2c39527 avfilter/x86/vf_fspp: Fix invalid combination of opcode and operands 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-26 01:43:47 +02:00
Michael Niedermayer
6b783d2ace Merge commit '7046bd9bc9ce04521edf453c9b603d84d69c7512' 
* commit '7046bd9bc9ce04521edf453c9b603d84d69c7512':
  lavfi: Move avcodec header to the only filter needing it

Conflicts:
	libavfilter/avfilter.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-20 19:14:11 +02:00
Vittorio Giovara
7046bd9bc9 lavfi: Move avcodec header to the only filter needing it 
af_ashowinfo, due to the enum AVAudioServiceType use.
 2015-05-19 18:56:40 +01:00
Michael Niedermayer
0c0d1a4ef2 avfilter/avfiltergraph: Rename ff_avfilter_graph_config_pointers to graph_config_pointers. 
The function is static and only used once in the file its defined in.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-18 13:22:27 +02:00
Michael Niedermayer
8e3b1f259e avfilter/buffersink: return EOF if closed link in av_buffersink_get_frame_flags() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-17 00:22:09 +02:00
Michael Niedermayer
00f5c8f98d avfilter/vf_zoompan: free out AVFrame on failure 
Fixes: CID1197065

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-13 01:58:45 +02:00
Michael Niedermayer
d3c9f1fdbe avfilter/avf_showcqt: Fix gamma comparisons 
Fixes CID1297587, CID1297586, 1297585

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-12 20:31:21 +02:00
Michael Niedermayer
0d05406482 avfilter/vf_cover_rect: Handle the case where the cover rectangle is as large as the input 
Fixes division by 0
Fixes CID1297575

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-12 20:19:47 +02:00
Michael Niedermayer
1431b4cf77 avfilter/vf_fftfilt: Add MAX_PLANES and change it to 4 
The 4th planes is currently unused as no formats with alpha are supported yet

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-12 20:08:18 +02:00
Paul B Mahol
94e293a83c avfilter/af_aphaser: reject too small delay 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-05-12 12:04:09 +00:00
Anton Khirnov
3735b5c616 Revert "lavfi: always check av_expr_parse_and_eval() return value" 
This reverts commit 63be97ec40.

All those calls were unchecked on purpose, as explained in the comments
in the code.
 2015-05-05 16:27:24 +02:00
James Almer
3f7986f983 avfilter/Makefile: add missing lavfutils.c dependency to cover_rect and find_rect filters 
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-05-05 02:16:37 -03:00
Michael Niedermayer
b4cc7d67f5 avfilter/vf_cover_rect: clip rectangle if it is partly outside the input 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-04 22:33:17 +02:00
Carl Eugen Hoyos
0bca6182b2 lavfi/cropdetect: Fix cropdetect for > 8 bit input. 2015-05-04 17:50:16 +02:00
Muhammad Faiz
a141948a8b avfilter/avf_showcqt: optimize gamma calculation 
benchmark (on intel core2 duo, gcc 4.9.1)
input samples duration 00:03:39.59
command: time -p ffmpeg -f f32le -ac 2 -ar 44100 -i input.pcm \
         -filter_complex showcqt=fullhd=0:gamma=$gamma \
         -f rawvideo -y /dev/null
gamma  previous  modified
  1    48.49 s   45.38 s
  2    49.33 s   48.11 s
  3    80.86 s   59.80 s
  4    80.84 s   51.25 s
  5    80.75 s   61.06 s
  6    80.93 s   61.80 s
  7    80.03 s   61.56 s

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-03 11:53:04 +02:00
Michael Niedermayer
61b4ab1860 avfilter: Add cover_rect filter 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-02 21:15:48 +02:00
Michael Niedermayer
94340e4b28 avfilter: add find_rect filter 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-02 21:15:48 +02:00
Michael Niedermayer
dc4a6e4d5a avfilter/vf_libopencv: Make ocv_filter_entries const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-02 15:13:30 +02:00
Michael Niedermayer
d2184bf3b6 avfilter/lavfutils: disable frame threads when decoding a single image 
The image decoding code does expect the image to be decoded immedeatly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-30 03:48:33 +02:00
Michael Niedermayer
f8fa392a2e avfilter/vf_vignette: force per frame evaluation if per frame variables are used 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-29 23:13:58 +02:00
Federico Tomassetti
8eb57dc9d5 buffersrc: Use the correct deallocation function 
This correction was suggested to me by Michael Niedermayer

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-04-22 12:26:53 +02:00
Michael Niedermayer
a79cbc0b8e avfilter/vf_qp: Fix use of uinitialized variable 
Found-by: <Timothy_Gu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-21 22:54:13 +02:00
Michael Niedermayer
122150168f Merge commit '9b2c57bef5e2f3f61a5fd708ba7d5351f5b3f386' 
* commit '9b2c57bef5e2f3f61a5fd708ba7d5351f5b3f386':
  drawtext: Add an alpha option

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-21 20:20:58 +02:00
Michael Niedermayer
8f9a3817d5 avfilter/vf_qp: fix cleanup on error 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-21 14:11:30 +02:00
Luca Barbato
9b2c57bef5 drawtext: Add an alpha option 
And document both `draw` and `alpha`.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-04-21 11:13:30 +02:00
Michael Niedermayer
a6df9ce615 avfilter/buffersrc: Use correct, matching deallocation function 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 12:33:20 +02:00
Michael Niedermayer
0c9e78caf4 Merge commit '617814b4a717b38add5ccb8dd200dbb655f98f09' 
* commit '617814b4a717b38add5ccb8dd200dbb655f98f09':
  buffersrc: Fix resource leak on error

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 12:15:16 +02:00
Michael Niedermayer
40d552dae6 Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8' 
* commit '1a3eb042c704dea190c644def5b32c9cee8832b8':
  Replace av_dlog with normal av_log at trace level

Conflicts:
	ffplay.c
	libavdevice/fbdev_dec.c
	libavfilter/avfilter.c
	libavfilter/internal.h
	libavfilter/setpts.c
	libavfilter/src_movie.c
	libavfilter/vf_crop.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fieldorder.c
	libavformat/assdec.c
	libavformat/avidec.c
	libavformat/flvdec.c
	libavformat/http.c
	libavformat/ipmovie.c
	libavformat/isom.c
	libavformat/mov.c
	libavformat/mpegenc.c
	libavformat/mpegts.c
	libavformat/mpegtsenc.c
	libavformat/mux.c
	libavformat/mxfdec.c
	libavformat/nsvdec.c
	libavformat/oggdec.c
	libavformat/r3d.c
	libavformat/rtspdec.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 03:19:47 +02:00
Federico Tomassetti
617814b4a7 buffersrc: Fix resource leak on error 
Bug-Id: CID 1267902
CC: libav-stable@libav.org
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-04-19 23:50:46 +01:00
Himangi Saraogi
88d1fb4e3f filtfmts: Avoid null pointer dereference 2015-04-19 23:45:35 +01:00
Vittorio Giovara
1a3eb042c7 Replace av_dlog with normal av_log at trace level 
This applies to every library where performance is not critical.
 2015-04-19 12:41:59 +01:00
Nicolas George
38155865df lavfi/avf_showcqt: fix error code. 
Signed-off-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-16 12:38:28 +02:00
Ivan Efimov
2051b401cc avfilter/drawtext: fix frame mem leak 
Signed-off-by: Ivan Efimov <ioefimov@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-14 12:04:52 +02:00
Michael Niedermayer
d5dcd94630 avfilter/vf_scale: Add warning for AVCOL_SPC_YCGCO 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-13 13:45:41 +02:00