aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-07-29 11:20:57 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-07-29 11:30:28 +0200
commit03853b1091e4a60c772677aa885e3d7e0ff19a12 (patch)
tree66382ea0ed5e167148521463665930c5548c0d32
parent688331c51ce649b9c884dab620d097a54e4aa3e3 (diff)
parentf1cb490d6d7391ff7e28cc376908cc98a652228d (diff)
downloadffmpeg-03853b1091e4a60c772677aa885e3d7e0ff19a12.tar.gz
Merge commit 'f1cb490d6d7391ff7e28cc376908cc98a652228d'
* commit 'f1cb490d6d7391ff7e28cc376908cc98a652228d': xl: Fix the buffer size check Conflicts: libavcodec/xl.c See: 8c59e0c362b948a746392b65932dd1cfeab8076c Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions