aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/ansi.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-09-02 11:20:13 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-09-02 11:20:13 +0200
commit35469835bb2960f85b6c4acf19632333307937e7 (patch)
tree32a24e79c1b95662d687176b374fce3dd79ed9db /libavcodec/ansi.c
parent4cabee50f624de9b9bb074d8571abb0f06e0b635 (diff)
parente48d1ea541be4592ebac89875557407ca958b7a9 (diff)
downloadffmpeg-35469835bb2960f85b6c4acf19632333307937e7.tar.gz
Merge commit 'e48d1ea541be4592ebac89875557407ca958b7a9'
* commit 'e48d1ea541be4592ebac89875557407ca958b7a9': ismindex: improve diagnostics Conflicts: tools/ismindex.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ansi.c')
0 files changed, 0 insertions, 0 deletions