aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-09-23 15:04:05 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-09-23 15:04:09 +0200
commit3f3867ca275233f696cea51d09b9390c21cb7de5 (patch)
tree017185cb39730c6415b2f73688f4975e5bea3199 /libavcodec
parent356031348c3b26aa9698e863d88bf87e8190bcc6 (diff)
parent231e50157cc9a7a8b08ba3d0e566279fc6cbb800 (diff)
downloadffmpeg-3f3867ca275233f696cea51d09b9390c21cb7de5.tar.gz
Merge remote-tracking branch 'cigaes/master'
* cigaes/master: lavfi/dualinput: reimplement on top of framesync. lavfi: add an API to synchronize multiple video inputs. Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
0 files changed, 0 insertions, 0 deletions