generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
61,529 Commits 24 Branches 241 Tags
dd9b24a48808b9cd31b93e517ff228f497b51b83
Commit Graph

4240 Commits

Author SHA1 Message Date
Michael Niedermayer
5ac46a0969 Merge commit '37e2d574ddcedc25e32bd963737b033354543789' into release/2.2 
* commit '37e2d574ddcedc25e32bd963737b033354543789':
  setpts: Add missing inttypes.h #include for PRId64

Conflicts:
	libavfilter/setpts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-23 03:15:51 +02:00
Diego Biurrun
37e2d574dd setpts: Add missing inttypes.h #include for PRId64 
Also convert a debug av_log() to av_dlog().

(cherry picked from commit a89dd9a72c6e9c3111d6f34d9b08cd624fe76358)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-08-20 10:07:09 -07:00
Michael Niedermayer
f99b17bd32 avfilter/f_select: avoid double->int in debug output 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6f622e5fcb)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-05 04:13:38 +02:00
Michael Niedermayer
21f6b07a97 avfilter/f_select: Set var_values[VAR_KEY] correctly 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit bcbfb95b0e)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-05 04:13:38 +02:00
Michael Niedermayer
c9f1456a41 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>
(cherry picked from commit 887d8d293f)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-05 04:13:38 +02:00
Diego Biurrun
01a550bda2 vf_select: Drop a debug av_log with an unchecked double to enum conversion 
CC: libav-stable@libav.org
(cherry picked from commit a8d803a320)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-07-30 10:12:17 -07:00
Michael Niedermayer
64e069efac avfilter/f_ebur128: Use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a97137e948)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-14 23:04:44 +02:00
Michael Niedermayer
f38c42b913 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>
(cherry picked from commit b8255a4c70)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-14 23:04:44 +02:00
Michael Niedermayer
a770a61e6d 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>
(cherry picked from commit 6dffc8f5aa)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-14 23:04:43 +02:00
Michael Niedermayer
b2111ad4df Merge commit '95e91aaf335dd9c26a9101c38d4926e5271e7e00' into release/2.2 
* commit '95e91aaf335dd9c26a9101c38d4926e5271e7e00':
  af_compand: make sure request_frame always outputs at least one frame

See: 6b68e2a43b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-14 22:58:44 +02:00
Andrew Kelley
95e91aaf33 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>
(cherry picked from commit d3cfd7aff8)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-07-08 17:40:07 +00:00
Michael Niedermayer
ea28034f5d Merge commit 'ff79f6b35a94dde69b3d52bd2abdfdb793f525c3' into release/2.2 
* commit 'ff79f6b35a94dde69b3d52bd2abdfdb793f525c3':
  avfilter: Add missing emms_c when needed

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-11 17:10:07 +02:00
Luca Barbato
ff79f6b35a avfilter: Add missing emms_c when needed 
Arch specific calls should have an emms_c following to keep the cpu
state consistent.

Reported-By: wm4
CC: libav-stable@libav.org
(cherry picked from commit e995cf1bcc)
 2014-05-10 11:11:21 -04:00
Michael Niedermayer
02b7b125b5 avfilter/graphdump: Fix pointer to local outside scope 
Fixes CID1194435
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 18af0ce62d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-05 00:09:17 +02:00
Michael Niedermayer
c588316555 avfilter/filtfmts: Support dynamically allocated in/outputs 
Fixes crash
Fixes Ticket3468

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-05 00:09:17 +02:00
Michael Niedermayer
16a9c5ea9e 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>
(cherry picked from commit 73734282e0)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-05 00:09:17 +02:00
Michael Niedermayer
83fb31a76d 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>
(cherry picked from commit 5a8ef3c66b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-05 00:09:17 +02:00
Michael Niedermayer
5cb2a1c3f0 avfilter/vf_pullup: fix gray8 
Fixes segfault
Fixes Ticket3469

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-10 04:53:00 +02:00
Michael Niedermayer
194485cfba avfilter/vf_pullup: zero freed memory for saftey 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a44409e692)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-27 11:20:56 +01:00
wm4
81cfe39113 vf_pullup: simplify, fix double free error 
The memory allocation for f->diffs was freed multiple times in some
corner cases. Simplify the code so that this doesn't happen.

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-27 11:20:56 +01:00
Michael Niedermayer
9a884b7b97 Merge commit '80239a8bb11f730d95f03dfbd0deab258b413b0e' into release/2.2 
* commit '80239a8bb11f730d95f03dfbd0deab258b413b0e':
  af_channelmap: fix ONE_STR mapping mode

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-23 19:56:37 +01:00
Anton Khirnov
80239a8bb1 af_channelmap: fix ONE_STR mapping mode 
get_channel() returns 0 on success

CC:libav-stable@libav.org
(cherry picked from commit e843612695)
 2014-03-23 11:41:40 -04:00
Michael Niedermayer
f67e75b5dc Merge commit '227cfc1f10a940c88ad3742ec805c07b6a5e7abb' into release/2.2 
* commit '227cfc1f10a940c88ad3742ec805c07b6a5e7abb':
  vf_frei0r: adjust error messages

Conflicts:
	libavfilter/vf_frei0r.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-11 12:16:05 +01:00
Michael Niedermayer
35e63f35b0 Merge commit '416847d19593e87ee1704c26a9a638fd6b0d977c' into release/2.2 
* commit '416847d19593e87ee1704c26a9a638fd6b0d977c':
  vf_frei0r: prevent a segfault when filter parameters are not set

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-11 12:15:51 +01:00
Vittorio Giovara
227cfc1f10 vf_frei0r: adjust error messages 
(cherry picked from commit 8accddeb58)
 2014-03-09 17:54:01 -04:00
Vittorio Giovara
416847d195 vf_frei0r: prevent a segfault when filter parameters are not set 
(cherry picked from commit 4e0be9c86f)
 2014-03-09 17:53:47 -04:00
Vittorio Giovara
bd4ad1a1d5 vf_frei0r: fix missing end of line character 
Error introduced in 61b323ce7c.

(cherry picked from commit 4c41a7a179)
 2014-03-09 17:53:33 -04:00
Vittorio Giovara
6230de03aa vf_frei0r: refactor library loading from env variable 
strtok_r is not needed any more, so remove it from configure.

(cherry picked from commit 61b323ce7c)
 2014-03-09 17:53:24 -04:00
Nicolas George
7d995cd1b8 lavfi/af_atempo: clear references before returning error. 
Once the frame has been given to ff_filter_frame(), it can
no longer be used, even on error.

Fix trac ticket #3430.
(cherry picked from commit bc6901c949)
 2014-03-08 15:17:14 +01:00
Anton Khirnov
00d5ff6431 af_compand: replace strtok_r() with av_get_token() 
(cherry picked from commit bc6461c286)
 2014-03-02 11:42:38 -05:00
Andrew Kelley
ba21499648 lavfi: add compand audio filter 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 738f83582a)

Conflicts:
	libavfilter/version.h
 2014-03-02 11:42:38 -05:00
Anton Khirnov
58556826a8 af_volume: preserve frame properties 
(cherry picked from commit 39c2880eea)
 2014-03-02 11:42:37 -05:00
Anton Khirnov
7933039ade af_resample: preserve frame properties 
(cherry picked from commit dcc7e4bf1d)
 2014-03-02 11:42:37 -05:00
Marton Balint
ead0dd3cf6 lavfi/frei0r: factorize plugin loading with static path 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2014-02-26 22:48:37 +01:00
Marton Balint
35ead1f281 lavfi/frei0r: search plugins in lib64 dirs on all architectures 
As Reimar Döffinger pointed out there are non-x86 64bit architectures as well.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2014-02-26 22:46:15 +01:00
Paul B Mahol
9f2a3bcee7 avfilter: remove superflous lines 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2014-02-26 16:37:59 +00:00
Paul B Mahol
a2e4b4e968 avfilter/af_compand: some more cosmetics to decrease difference with qatar 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2014-02-26 15:03:09 +00:00
Michael Niedermayer
8f946ac8ea avfilter: remove af_compand_fork 
All relevant changes except the float/double one have been merged

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 13:21:29 +01:00
Michael Niedermayer
c62d83a5e7 avfilter/af_compand: more cosmetics from libavfilter/af_compand_fork.c 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 13:12:38 +01:00
Michael Niedermayer
05412f4cd4 avfilter/af_compand: cosmetics from libavfilter/af_compand_fork.c 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 13:00:09 +01:00
Michael Niedermayer
5e02ff3e3d avfilter/af_compand: switch defaults to libavfilter/af_compand_fork.c 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 13:00:09 +01:00
Michael Niedermayer
619d6b8f55 avfilter/af_compand: "use local variable for channels" from libavfilter/af_compand_fork.c 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 13:00:09 +01:00
Michael Niedermayer
e509df4bc8 avfilter/af_compand: error checks from libavfilter/af_compand_fork.c 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 13:00:09 +01:00
Michael Niedermayer
4b87975147 avfilter/af_compand: pts init code from libavfilter/af_compand_fork.c 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 12:46:04 +01:00
Michael Niedermayer
5c78fe08b0 avfilter/af_compand: cosmetics and doxy comment from libavfilter/af_compand_fork.c 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 12:42:47 +01:00
Michael Niedermayer
66ad3292eb avfilter/af_compand: add Andrew Kelley to the copyright 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 12:40:33 +01:00
Michael Niedermayer
86a191e25b avfilter/af_compand: merge avframe code from af_compand_fork 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 12:33:28 +01:00
Michael Niedermayer
27ba05adbc avfilter/af_compand: merge uninit() calls on error from af_compand_fork.c 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 12:11:33 +01:00
Michael Niedermayer
8b80485960 avfilter/af_compand: also support '|' as seperator 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 12:04:00 +01:00
Michael Niedermayer
1df1a1fe61 avfilter/af_compand_fork: avoid strtok_r() so as not to break build 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 11:48:34 +01:00