aboutsummaryrefslogtreecommitdiffstats
path: root/libavdevice/lavfi.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-04-11 01:39:15 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-04-11 01:42:28 +0200
commitac217bda30a79177c8a47713b3db12dc9e9bd45b (patch)
tree79dedb63dc984965e81a5718a5a376313d75c7f4 /libavdevice/lavfi.c
parent314be1933e3a39abd6576184786703701ced4415 (diff)
parentb2b25b0659fa047da6266d2ce165d43011136b30 (diff)
downloadffmpeg-ac217bda30a79177c8a47713b3db12dc9e9bd45b.tar.gz
Merge commit 'b2b25b0659fa047da6266d2ce165d43011136b30'
* commit 'b2b25b0659fa047da6266d2ce165d43011136b30': af_asyncts: switch to an AVOptions-based system. Conflicts: libavfilter/af_asyncts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/lavfi.c')
0 files changed, 0 insertions, 0 deletions