diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-23 22:08:15 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-23 22:08:15 +0200 |
commit | e3601ceeb87516ac141605a41193aa4d726a2cf8 (patch) | |
tree | 1cb992083d840480146a76d551b7c1be9a52e0b2 /doc/rate_distortion.txt | |
parent | 9bff8cfc913e55c2fb0f12be3d7ed06b681166c6 (diff) | |
parent | 5caf039ba2b4be067568a30146f29008d8db28d0 (diff) | |
download | ffmpeg-e3601ceeb87516ac141605a41193aa4d726a2cf8.tar.gz |
Merge commit '5caf039ba2b4be067568a30146f29008d8db28d0'
* commit '5caf039ba2b4be067568a30146f29008d8db28d0':
Prepare for 11_beta2 Release
Conflicts:
RELEASE
Not merged as theres no FFmpeg 11_beta2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/rate_distortion.txt')
0 files changed, 0 insertions, 0 deletions