diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 20:32:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 20:32:00 +0200 |
| commit | c24be3c4a2e15e7295bdef8183deb168b6835eb9 (patch) | |
| tree | 209d2e7202b7a331db1ba7a1443b75cd2eef2e29 /libavutil/lzo.h | |
| parent | 3787495e1f2c2e2de333cf452021822c2655c8d0 (diff) | |
| parent | 59cc0812207e3c2e2f2e559d60d0a8f9296a8847 (diff) | |
| download | ffmpeg-c24be3c4a2e15e7295bdef8183deb168b6835eb9.tar.gz | |
Merge commit '59cc0812207e3c2e2f2e559d60d0a8f9296a8847'
* commit '59cc0812207e3c2e2f2e559d60d0a8f9296a8847':
Prepare for 11_alpha2 Release
Conflicts:
RELEASE
Not merged, as our release numbers differ
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/lzo.h')
0 files changed, 0 insertions, 0 deletions