diff options
author | Michael Niedermayer <[email protected]> | 2014-04-01 03:51:32 +0200 |
---|---|---|
committer | Michael Niedermayer <[email protected]> | 2014-04-01 03:51:52 +0200 |
commit | 5b03caf9491d3f4a1ddbb5e1c9e7e619c4390af5 (patch) | |
tree | fcd3b2bd03761e4de6b971ecb7f19d2f25d87a11 /doc/examples/scaling_video.c | |
parent | 013aa222c624c62fd61eb033803bc297b6681ea0 (diff) | |
parent | 6d9ccee4519f41155c88655c77bfb1ef085797fd (diff) |
Merge commit '6d9ccee4519f41155c88655c77bfb1ef085797fd'
* commit '6d9ccee4519f41155c88655c77bfb1ef085797fd':
sgi: set the row boundary to the correct value
Conflicts:
libavcodec/sgidec.c
See: 39c56ef9216c508a2c19cef93600e6590b4595cd
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'doc/examples/scaling_video.c')
0 files changed, 0 insertions, 0 deletions