summaryrefslogtreecommitdiff
path: root/libavfilter
Commit message (Collapse)AuthorAge
* lavfi/af_atempo: clear references before returning error.Nicolas George2014-03-08
| | | | | | | Once the frame has been given to ff_filter_frame(), it can no longer be used, even on error. Fix trac ticket #3430.
* avfilter/vf_shuffleplanes: Fix flags / add AV_OPT_FLAG_FILTERING_PARAMMichael Niedermayer2014-03-06
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-06
|\ | | | | | | | | | | | | * qatar/master: vf_shuffleplanes: fix the type of the mapping indices Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_shuffleplanes: fix the type of the mapping indicesAnton Khirnov2014-03-06
| | | | | | | | They are TYPE_INT AVOptions, so they must be ints
* | Merge commit '599b81ca9a8e04a27ddad94af462171d16063167'Michael Niedermayer2014-03-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * lavfi: add shuffleplanes filterAnton Khirnov2014-03-05
| |
* | Merge commit 'bba2a7cc5f7c7aaa32a938f3d4edd9f555f39cdb'Michael Niedermayer2014-03-06
|\| | | | | | | | | | | | | * commit 'bba2a7cc5f7c7aaa32a938f3d4edd9f555f39cdb': lavfi: use the correct filter context for logging an error. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi: use the correct filter context for logging an error.Anton Khirnov2014-03-05
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-05
|\| | | | | | | | | | | | | * qatar/master: avfilter: Add missing emms_c when needed Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avfilter: Add missing emms_c when neededLuca Barbato2014-03-05
| | | | | | | | | | | | | | | | Arch specific calls should have an emms_c following to keep the cpu state consistent. Reported-By: wm4 CC: libav-stable@libav.org
| * vf_frei0r: fix missing end of line characterVittorio Giovara2014-03-04
| | | | | | | | Error introduced in 61b323ce7c7cdc101eadfd7de2203922b8a39e8d.
| * vf_frei0r: refactor library loading from env variableVittorio Giovara2014-03-04
| | | | | | | | strtok_r is not needed any more, so remove it from configure.
* | Merge commit '4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e'Michael Niedermayer2014-03-04
|\| | | | | | | | | | | | | * commit '4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e': vf_frei0r: prevent a segfault when filter parameters are not set Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_frei0r: prevent a segfault when filter parameters are not setVittorio Giovara2014-03-04
| |
* | Merge commit '8accddeb5806cd98e3803b4ddf2a2ef576d0e4d9'Michael Niedermayer2014-03-04
|\| | | | | | | | | | | | | | | | | | | * commit '8accddeb5806cd98e3803b4ddf2a2ef576d0e4d9': vf_frei0r: adjust error messages Conflicts: libavfilter/vf_frei0r.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_frei0r: adjust error messagesVittorio Giovara2014-03-04
| |
| * af_compand: replace strtok_r() with av_get_token()Anton Khirnov2014-02-28
| |
* | lavfi/frei0r: factorize plugin loading with static pathMarton Balint2014-02-26
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Marton Balint <cus@passwd.hu>
* | lavfi/frei0r: search plugins in lib64 dirs on all architecturesMarton Balint2014-02-26
| | | | | | | | | | | | | | 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>
* | avfilter: remove superflous linesPaul B Mahol2014-02-26
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avfilter/af_compand: some more cosmetics to decrease difference with qatarPaul B Mahol2014-02-26
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avfilter: remove af_compand_forkMichael Niedermayer2014-02-26
| | | | | | | | | | | | All relevant changes except the float/double one have been merged Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/af_compand: more cosmetics from libavfilter/af_compand_fork.cMichael Niedermayer2014-02-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/af_compand: cosmetics from libavfilter/af_compand_fork.cMichael Niedermayer2014-02-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/af_compand: switch defaults to libavfilter/af_compand_fork.cMichael Niedermayer2014-02-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/af_compand: "use local variable for channels" from ↵Michael Niedermayer2014-02-26
| | | | | | | | | | | | libavfilter/af_compand_fork.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/af_compand: error checks from libavfilter/af_compand_fork.cMichael Niedermayer2014-02-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/af_compand: pts init code from libavfilter/af_compand_fork.cMichael Niedermayer2014-02-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/af_compand: cosmetics and doxy comment from ↵Michael Niedermayer2014-02-26
| | | | | | | | | | | | libavfilter/af_compand_fork.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/af_compand: add Andrew Kelley to the copyrightMichael Niedermayer2014-02-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/af_compand: merge avframe code from af_compand_forkMichael Niedermayer2014-02-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/af_compand: merge uninit() calls on error from af_compand_fork.cMichael Niedermayer2014-02-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/af_compand: also support '|' as seperatorMichael Niedermayer2014-02-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/af_compand_fork: avoid strtok_r() so as not to break buildMichael Niedermayer2014-02-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/af_compand: whitespace changes from af_compand_forkMichael Niedermayer2014-02-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-02-26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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: 6b68e2a43b3407522080be50a2a19cff2f9715ef Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi: add compand audio filterAndrew Kelley2014-02-26
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avfilter/af_compand: fix invalid readAndrew Kelley2014-02-25
| | | | | | | | Fixes #3383.
* | Merge commit '39c2880eeae6930b1036ce1f479afc1e1152c13f'Michael Niedermayer2014-02-24
|\| | | | | | | | | | | | | | | | | | | * commit '39c2880eeae6930b1036ce1f479afc1e1152c13f': af_volume: preserve frame properties Conflicts: libavfilter/af_volume.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * af_volume: preserve frame propertiesAnton Khirnov2014-02-24
| |
* | Merge commit 'dcc7e4bf1d0913123bfafbc58bf47bd41dd5848d'Michael Niedermayer2014-02-24
|\| | | | | | | | | | | | | * commit 'dcc7e4bf1d0913123bfafbc58bf47bd41dd5848d': af_resample: preserve frame properties Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * af_resample: preserve frame propertiesAnton Khirnov2014-02-24
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-02-24
|\| | | | | | | | | | | | | | | | | | | * qatar/master: Use av_frame_copy() to simplify code where appropriate. Conflicts: libavfilter/vf_copy.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Use av_frame_copy() to simplify code where appropriate.Anton Khirnov2014-02-24
| |
* | Fix FSF address in colormatrix and libzvbi license headers.Carl Eugen Hoyos2014-02-22
| | | | | | | | | | As reported by irc user aca. The files in compat/avisynth are maintained elsewhere, no changes.
* | Merge remote-tracking branch 'cigaes/master'Michael Niedermayer2014-02-20
|\ \ | | | | | | | | | | | | | | | | | | * cigaes/master: lavfi/pan: use extended_data instead of data. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavfi/pan: use extended_data instead of data.Nicolas George2014-02-19
| | | | | | | | | | | | Fix trac ticket #3380.
* | | avfilter/vf_fps: fix rounding error accumulationMichael Niedermayer2014-02-20
| | | | | | | | | | | | | | | | | | | | | Fixes Ticket3329 Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-02-19
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | * qatar/master: vf_interlace: deprecate lowpass option Conflicts: libavfilter/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_interlace: deprecate lowpass optionVittorio Giovara2014-02-19
| |