Commit Graph

4495 Commits

Author SHA1 Message Date
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
Luca Barbato f1b239ec8b drawtext: Add fontconfig support
Introduce the `font` option and make it optional to pass a fontfile.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-04-17 00:41:30 +02:00
Michael Niedermayer 7999b41d48 avfilter/vf_pixdesctest: use av_malloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-16 19:44:23 +02:00
Michael Niedermayer 73734282e0 avfilter/vf_deshake: fix loss of precission with odd resolutions
Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-16 03:44:57 +02:00
Michael Niedermayer 5a8ef3c66b avfilter/f_select: fix loss of precission in SAD calculation
Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-16 03:44:57 +02:00
Michael Niedermayer 878f8b0d26 Merge commit 'aaab192df24a90f4450285cfb73b395cf495b462'
* commit 'aaab192df24a90f4450285cfb73b395cf495b462':
  af_volume: implement replaygain clipping prevention

Conflicts:
	doc/filters.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-13 14:39:51 +02:00
Facundo Gaich 7e6b3ad693 lavfi/subtitles: load attached fonts to libass.
Videos with complex typesetting usually have font files embedded
as attachment streams. vf_subtitles now finds all attachment
streams with a MIME type associated with fonts and loads them
to libass so it can use them for rendering.

The code was basically ported from mpv's loadfile.c@929793be7

Signed-off-by: Facundo Gaich <facugaich@gmail.com>
2014-04-13 12:06:24 +02:00
Alessandro Ghedini aaab192df2 af_volume: implement replaygain clipping prevention
This adds a new "replaygain_noclip" option to the filter, and, if enabled,
limits the gain applied for tracks where clipping would occur.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-04-13 11:25:06 +02:00
Michael Niedermayer 6290ba0052 avfilter/settb: remove duplicate #include
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-10 21:58:03 +02:00
Michael Niedermayer 4764714952 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  libavfilter: Add asettb filter for setting timebase for audio

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

See: ba856c0be5 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-10 15:08:04 +02:00
Nicolas George ad8159e0fe libavfilter: Add asettb filter for setting timebase for audio
Ported asettb (including the sr option for audio sample rate) from FFmpeg,
and copied/modified the existing settb documentation for asettb.

Signed-off-by: Katerina Barone-Adesi <katerinab+libav@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-04-10 12:52:19 +02:00
Michael Niedermayer e36aaeca3a avfilter/vf_colormatrix: fix memleak on error
Fixes CID1197065
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-08 01:25:00 +02:00
Michael Niedermayer ebb21887b8 Merge commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8'
* commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8':
  x86: Drop some unnecessary YASM ifdefs

Conflicts:
	libavfilter/x86/vf_yadif_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-05 19:16:39 +02:00
Michael Niedermayer b6850e132f Merge remote-tracking branch 'qatar/master'
* qatar/master:
  af_ashowinfo: print a more descriptive name for AV_MATRIX_ENCODING_DOLBY

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-05 00:42:47 +02:00
Michael Niedermayer 37af487170 Merge commit 'a49aa440c939e221194f8d95bf98673f8cf38a06'
* commit 'a49aa440c939e221194f8d95bf98673f8cf38a06':
  af_volume: implement replaygain pre-amplification

Conflicts:
	doc/filters.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-05 00:16:53 +02:00
Diego Biurrun 01c5779f56 x86: Drop some unnecessary YASM ifdefs
Dead code elimination is enough to avoid undefined references in these cases.
2014-04-04 19:08:05 +02:00
Anton Khirnov 9c21c08fa7 af_ashowinfo: print a more descriptive name for AV_MATRIX_ENCODING_DOLBY 2014-04-04 18:54:47 +02:00
Alessandro Ghedini a49aa440c9 af_volume: implement replaygain pre-amplification
This adds a new "replaygain_preamp" option to the filter, and simply adds its
value to the replaygain gain value.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-04-04 18:53:05 +02:00