diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-01 15:26:20 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-01 15:26:20 +0100 |
commit | 7ac50d846c8f4db117baf277e91ccf0ffb0ce633 (patch) | |
tree | 1a1d2e713b707db7916112a67d24047bc5a4ff77 /libavformat/tcp.c | |
parent | 0f4c03cd634031181479ca94874e1b80b5638417 (diff) | |
parent | 787a6156a2d887bb1d65c1233a94a61741e7af7c (diff) | |
download | ffmpeg-7ac50d846c8f4db117baf277e91ccf0ffb0ce633.tar.gz |
Merge commit '787a6156a2d887bb1d65c1233a94a61741e7af7c' into release/2.2
* commit '787a6156a2d887bb1d65c1233a94a61741e7af7c':
imc: fix order of operations in coefficients read
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/tcp.c')
0 files changed, 0 insertions, 0 deletions