diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 14:24:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 14:24:15 +0200 |
| commit | 238532700e841dd06cdd2d66f5842227838f73ba (patch) | |
| tree | 6f87f79b763f57e79bf5b47d1976a0ff2720df8d /libavutil/parseutils.c | |
| parent | ed9ab30f4cca55f0306fb91ad79562f1de4d3bb7 (diff) | |
| parent | 4c1e4bc6af1596995e895cd7da9f3b436051114c (diff) | |
| download | ffmpeg-238532700e841dd06cdd2d66f5842227838f73ba.tar.gz | |
Merge commit '4c1e4bc6af1596995e895cd7da9f3b436051114c' into release/1.1
* commit '4c1e4bc6af1596995e895cd7da9f3b436051114c':
Prepare for 9.13 Release
Conflicts:
RELEASE
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/parseutils.c')
0 files changed, 0 insertions, 0 deletions