aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-03 12:58:54 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-03 12:58:54 +0100
commitb568eeba75249813ea844e65bd57665a0dee9e55 (patch)
tree2ce39245cade18be4d906a4f22c54624b83abc02 /libavfilter
parentb6413cdc02f3ec9434fb6ab739e699b99b2154f6 (diff)
parent3ea5f64ffff0a51f62922efd2e2bc231b13b2179 (diff)
downloadffmpeg-b568eeba75249813ea844e65bd57665a0dee9e55.tar.gz
Merge commit '3ea5f64ffff0a51f62922efd2e2bc231b13b2179'
* commit '3ea5f64ffff0a51f62922efd2e2bc231b13b2179': ansi: fix possible use of uninitialized variables Conflicts: libavcodec/ansi.c Only partially merged, ffmpeg is not affected by this. Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
0 files changed, 0 insertions, 0 deletions