Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-03-26avfilter/vf_pullup: add comment to explain memset(0)Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-26avfilter/vf_pullup: zero freed memory for safteyMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-26vf_pullup: simplify, fix double free errorwm4
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>
2014-03-25Merge commit '6ee55c7b111eec6c51dfdc0fddbd46f5dd867fa3'Michael Niedermayer
* commit '6ee55c7b111eec6c51dfdc0fddbd46f5dd867fa3': vf_transpose: K&R formatting cosmetics Conflicts: libavfilter/vf_transpose.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-25vf_transpose: K&R formatting cosmeticsVittorio Giovara
2014-03-24Merge commit 'b4679ecdbd80ae050094733f137ccd7ebf1316ab'Michael Niedermayer
* commit 'b4679ecdbd80ae050094733f137ccd7ebf1316ab': {v,a}f_showinfo: print frame side data Conflicts: libavfilter/af_ashowinfo.c libavfilter/vf_showinfo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-24Merge commit '06c3cd3c0186803619bc6aad2d8f06c3e9015d15'Michael Niedermayer
* commit '06c3cd3c0186803619bc6aad2d8f06c3e9015d15': af_volume: support using replaygain frame side data Conflicts: doc/filters.texi libavfilter/af_volume.c libavfilter/af_volume.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-24{v,a}f_showinfo: print frame side dataAnton Khirnov
2014-03-24af_volume: support using replaygain frame side dataAnton Khirnov
2014-03-22Merge commit '7513234bdd93f80593bfee3eb2da8c8f0d3992da'Michael Niedermayer
* commit '7513234bdd93f80593bfee3eb2da8c8f0d3992da': avfilter: more correct printf format specifiers Conflicts: libavfilter/af_ashowinfo.c libavfilter/vf_showinfo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-22avfilter: more correct printf format specifiersDiego Biurrun
2014-03-18avfilter/src_movie: Check that the pixel format hasnt changedMichael Niedermayer
Fixes assertion failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-16avfilter/vf_tinterlace: Fix vf_tinterlace mode 6 (interlacex2)Jasper Taylor
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-16Merge commit 'e843612695007cc623813073754c651ab43021f7'Michael Niedermayer
* commit 'e843612695007cc623813073754c651ab43021f7': af_channelmap: fix ONE_STR mapping mode Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-16af_channelmap: fix ONE_STR mapping modeAnton Khirnov
get_channel() returns 0 on success CC:libav-stable@libav.org
2014-03-15avfilter: make avfilter_graph_get_filter use const string nameYu Xiaolei
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-08lavfi/af_atempo: clear references before returning error.Nicolas George
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-06avfilter/vf_shuffleplanes: Fix flags / add AV_OPT_FLAG_FILTERING_PARAMMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-06Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: vf_shuffleplanes: fix the type of the mapping indices Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-06Merge commit '599b81ca9a8e04a27ddad94af462171d16063167'Michael Niedermayer
* 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-06Merge commit 'bba2a7cc5f7c7aaa32a938f3d4edd9f555f39cdb'Michael Niedermayer
* commit 'bba2a7cc5f7c7aaa32a938f3d4edd9f555f39cdb': lavfi: use the correct filter context for logging an error. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-06vf_shuffleplanes: fix the type of the mapping indicesAnton Khirnov
They are TYPE_INT AVOptions, so they must be ints
2014-03-06lavfi: add shuffleplanes filterAnton Khirnov
2014-03-06lavfi: use the correct filter context for logging an error.Anton Khirnov
2014-03-05Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: avfilter: Add missing emms_c when needed Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-05avfilter: Add missing emms_c when neededLuca Barbato
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-04vf_frei0r: fix missing end of line characterVittorio Giovara
Error introduced in 61b323ce7c7cdc101eadfd7de2203922b8a39e8d.
2014-03-04Merge commit '4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e'Michael Niedermayer
* commit '4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e': vf_frei0r: prevent a segfault when filter parameters are not set Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-04Merge commit '8accddeb5806cd98e3803b4ddf2a2ef576d0e4d9'Michael Niedermayer
* commit '8accddeb5806cd98e3803b4ddf2a2ef576d0e4d9': vf_frei0r: adjust error messages Conflicts: libavfilter/vf_frei0r.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-04vf_frei0r: refactor library loading from env variableVittorio Giovara
strtok_r is not needed any more, so remove it from configure.
2014-03-04vf_frei0r: prevent a segfault when filter parameters are not setVittorio Giovara
2014-03-04vf_frei0r: adjust error messagesVittorio Giovara
2014-03-01af_compand: replace strtok_r() with av_get_token()Anton Khirnov
2014-02-27lavfi/frei0r: factorize plugin loading with static pathMarton Balint
Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Marton Balint <cus@passwd.hu>
2014-02-27lavfi/frei0r: search plugins in lib64 dirs on all architecturesMarton Balint
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-26avfilter: remove superflous linesPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2014-02-26avfilter/af_compand: some more cosmetics to decrease difference with qatarPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2014-02-26avfilter: remove af_compand_forkMichael Niedermayer
All relevant changes except the float/double one have been merged Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-26avfilter/af_compand: more cosmetics from libavfilter/af_compand_fork.cMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-26avfilter/af_compand: cosmetics from libavfilter/af_compand_fork.cMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-26avfilter/af_compand: switch defaults to libavfilter/af_compand_fork.cMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-26avfilter/af_compand: "use local variable for channels" from ↵Michael Niedermayer
libavfilter/af_compand_fork.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-26avfilter/af_compand: error checks from libavfilter/af_compand_fork.cMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-26avfilter/af_compand: pts init code from libavfilter/af_compand_fork.cMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-26avfilter/af_compand: cosmetics and doxy comment from ↵Michael Niedermayer
libavfilter/af_compand_fork.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-26avfilter/af_compand: add Andrew Kelley to the copyrightMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-26avfilter/af_compand: merge avframe code from af_compand_forkMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-26avfilter/af_compand: merge uninit() calls on error from af_compand_fork.cMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-26avfilter/af_compand: also support '|' as seperatorMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-26avfilter/af_compand_fork: avoid strtok_r() so as not to break buildMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>