aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/libmpcodecs/vf_softpulldown.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-01-01 14:04:50 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-01-01 14:04:50 +0100
commit9336a980bb2608089ad34cbf605fbb5ed9bca677 (patch)
tree6f94f20b462758e9c43598cb8c100f381bfde4dc /libavfilter/libmpcodecs/vf_softpulldown.c
parent8e4e532bb28ef8713145ec85aafac3b3fe2775e3 (diff)
parentc1ea44c54d837a69d8285601cfba7aa8df16e053 (diff)
downloadffmpeg-9336a980bb2608089ad34cbf605fbb5ed9bca677.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: rtmp: Add support for limelight authentication rtmp: Add support for adobe authentication Conflicts: Changelog libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/libmpcodecs/vf_softpulldown.c')
0 files changed, 0 insertions, 0 deletions