0d5ae023b2
avfilter/vf_tinterlace: Fix vf_tinterlace mode 6 (interlacex2)
...
The purpose of this filter mode is to allow interlaced content to
display properly in interlaced video modes, as described in
http://forum.xbmc.org/showthread.php?tid=81834 and
https://github.com/mpv-player/mpv/issues/624#issuecomment-37685195 . The
filter doubles the video frame rate, but does not work properly because:
(1) it does not set the properties of the output stream to indicate the
doubled frame rate, and
(2) it does not set an appropriate PTS on the extra frames.
The attached patch fixes these problems by settling these values the
same way they are set in vf_yadif mode 1 (field) which also doubles the
frame rate.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-03-16 17:25:54 +01:00
c198af648a
Merge commit 'e843612695007cc623813073754c651ab43021f7'
...
* commit 'e843612695007cc623813073754c651ab43021f7':
af_channelmap: fix ONE_STR mapping mode
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-03-16 14:18:01 +01:00
e843612695
af_channelmap: fix ONE_STR mapping mode
...
get_channel() returns 0 on success
CC:libav-stable@libav.org
2014-03-16 07:43:52 +01:00
fbe9ae482d
avfilter: make avfilter_graph_get_filter use const string name
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-03-14 23:18:59 +01:00
bc6901c949
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 .
2014-03-08 12:31:00 +01:00
ffe7e7c195
avfilter/vf_shuffleplanes: Fix flags / add AV_OPT_FLAG_FILTERING_PARAM
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-03-06 16:58:24 +01:00
d168729004
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
vf_shuffleplanes: fix the type of the mapping indices
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-03-06 15:18:14 +01:00
2fb0027c26
Merge commit '599b81ca9a8e04a27ddad94af462171d16063167'
...
* commit '599b81ca9a8e04a27ddad94af462171d16063167':
lavfi: add shuffleplanes filter
Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-03-06 13:07:20 +01:00
b76059058a
Merge commit 'bba2a7cc5f7c7aaa32a938f3d4edd9f555f39cdb'
...
* commit 'bba2a7cc5f7c7aaa32a938f3d4edd9f555f39cdb':
lavfi: use the correct filter context for logging an error.
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-03-06 12:38:09 +01:00
713d3f98c8
vf_shuffleplanes: fix the type of the mapping indices
...
They are TYPE_INT AVOptions, so they must be ints
2014-03-06 09:24:53 +01:00
599b81ca9a
lavfi: add shuffleplanes filter
2014-03-05 21:52:02 +01:00
bba2a7cc5f
lavfi: use the correct filter context for logging an error.
2014-03-05 21:52:02 +01:00
e3c93f1f84
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avfilter: Add missing emms_c when needed
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-03-05 13:51:44 +01:00
e995cf1bcc
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
2014-03-05 11:00:05 +01:00
4c41a7a179
vf_frei0r: fix missing end of line character
...
Error introduced in 61b323ce7c
2014-03-04 18:27:09 +01:00
bfe03205a8
Merge commit '4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e'
...
* commit '4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e':
vf_frei0r: prevent a segfault when filter parameters are not set
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-03-04 13:17:25 +01:00
2b0ff8d642
Merge commit '8accddeb5806cd98e3803b4ddf2a2ef576d0e4d9'
...
* commit '8accddeb5806cd98e3803b4ddf2a2ef576d0e4d9':
vf_frei0r: adjust error messages
Conflicts:
libavfilter/vf_frei0r.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-03-04 12:41:31 +01:00
61b323ce7c
vf_frei0r: refactor library loading from env variable
...
strtok_r is not needed any more, so remove it from configure.
2014-03-04 11:39:02 +01:00
4e0be9c86f
vf_frei0r: prevent a segfault when filter parameters are not set
2014-03-04 11:19:03 +01:00
8accddeb58
vf_frei0r: adjust error messages
2014-03-04 11:19:03 +01:00
bc6461c286
af_compand: replace strtok_r() with av_get_token()
2014-02-28 21:55:46 +01:00
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
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
9f2a3bcee7
avfilter: remove superflous lines
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2014-02-26 16:37:59 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
8b80485960
avfilter/af_compand: also support '|' as seperator
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-02-26 12:04:00 +01:00
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
22307f170f
avfilter/af_compand: whitespace changes from af_compand_fork
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-02-26 11:41:36 +01:00
5d166de258
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
lavfi: add compand audio filter
Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/af_compand.c
libavfilter/allfilters.c
libavfilter/version.h
The filter is added as new one so as to ease clean merging of its changes
in debug-able steps
See: 6b68e2a43bmichaelni@gmx.at >
2014-02-26 11:27:02 +01:00
738f83582a
lavfi: add compand audio filter
...
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2014-02-26 08:09:58 +01:00
9e329185d7
avfilter/af_compand: fix invalid read
...
Fixes #3383 .
2014-02-25 19:00:14 +00:00
6b06f9f1bc
Merge commit '39c2880eeae6930b1036ce1f479afc1e1152c13f'
...
* commit '39c2880eeae6930b1036ce1f479afc1e1152c13f':
af_volume: preserve frame properties
Conflicts:
libavfilter/af_volume.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-02-24 22:13:42 +01:00
fc10ed2cac
Merge commit 'dcc7e4bf1d0913123bfafbc58bf47bd41dd5848d'
...
* commit 'dcc7e4bf1d0913123bfafbc58bf47bd41dd5848d':
af_resample: preserve frame properties
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-02-24 21:46:00 +01:00
39c2880eea
af_volume: preserve frame properties
2014-02-24 17:32:26 +01:00
dcc7e4bf1d
af_resample: preserve frame properties
2014-02-24 17:30:48 +01:00
2a3cb1cfca
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
Use av_frame_copy() to simplify code where appropriate.
Conflicts:
libavfilter/vf_copy.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-02-24 10:47:47 +01:00
30517a9f05
Use av_frame_copy() to simplify code where appropriate.
2014-02-24 07:25:07 +01:00
b89596a432
Fix FSF address in colormatrix and libzvbi license headers.
...
As reported by irc user aca.
The files in compat/avisynth are maintained elsewhere, no changes.
2014-02-22 11:17:56 +01:00
cbd9cc5997
Merge remote-tracking branch 'cigaes/master'
...
* cigaes/master:
lavfi/pan: use extended_data instead of data.
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-02-20 02:53:39 +01:00
Jasper Taylor