aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/vf_telecine.c
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-09-26 19:18:56 -0300
committerJames Almer <jamrial@gmail.com>2017-09-26 19:18:56 -0300
commit0e56321aef0b5c5a0e9f7a34f019b2e478319661 (patch)
tree161751b19dd445632159150449f16c51359797cc /libavfilter/vf_telecine.c
parent0c224ce231c8c9a3494b21f9b3155ed18dc3e4cf (diff)
parentf7ec7f546f0021d28da284b024416b916b61c974 (diff)
downloadffmpeg-0e56321aef0b5c5a0e9f7a34f019b2e478319661.tar.gz
Merge commit 'f7ec7f546f0021d28da284b024416b916b61c974'
* commit 'f7ec7f546f0021d28da284b024416b916b61c974': wma: Convert to the new bitstream reader This commit is a noop, see http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavfilter/vf_telecine.c')
0 files changed, 0 insertions, 0 deletions