aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/xga_font_data.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-07-29 11:08:02 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-07-29 11:08:02 +0200
commit688331c51ce649b9c884dab620d097a54e4aa3e3 (patch)
tree66382ea0ed5e167148521463665930c5548c0d32 /libavutil/xga_font_data.c
parent19da86f3ff433913938807e49fc6caa0f9f927b2 (diff)
parente13a929314e4a9a09d3146648f876f162f46cc32 (diff)
downloadffmpeg-688331c51ce649b9c884dab620d097a54e4aa3e3.tar.gz
Merge commit 'e13a929314e4a9a09d3146648f876f162f46cc32'
* commit 'e13a929314e4a9a09d3146648f876f162f46cc32': xl: K&R formatting cosmetics Conflicts: libavcodec/xl.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/xga_font_data.c')
0 files changed, 0 insertions, 0 deletions