diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-01 15:26:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-01 15:26:51 +0100 |
| commit | 3bb4c3e74dee88ceb4956f2a8da2574abf91a5b7 (patch) | |
| tree | f202a8754d9b0f3b6030784c457d1015526aaeaa /libswscale/version.h | |
| parent | 7ac50d846c8f4db117baf277e91ccf0ffb0ce633 (diff) | |
| parent | 72ed4166a64714952777fb028b546a52e5b4e2c2 (diff) | |
| download | ffmpeg-3bb4c3e74dee88ceb4956f2a8da2574abf91a5b7.tar.gz | |
Merge commit '72ed4166a64714952777fb028b546a52e5b4e2c2' into release/2.2
* commit '72ed4166a64714952777fb028b546a52e5b4e2c2':
resample: Avoid off-by-1 errors in PTS calcs.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/version.h')
0 files changed, 0 insertions, 0 deletions