diff options
author | Michael Niedermayer <[email protected]> | 2015-06-03 19:03:08 +0200 |
---|---|---|
committer | Michael Niedermayer <[email protected]> | 2015-06-03 19:07:12 +0200 |
commit | 6034b4bb88c1e5fc47fe2c2ff81835cb3dd4e872 (patch) | |
tree | 790ff579aa1ba6ca2fbc611c0b8882aefac119d5 /doc/APIchanges | |
parent | ee08beb7d92150c61824a8eee722a6e4677a090c (diff) | |
parent | 7f596368a404363d72b1be6d16c51420a71bc523 (diff) |
Merge commit '7f596368a404363d72b1be6d16c51420a71bc523'
* commit '7f596368a404363d72b1be6d16c51420a71bc523':
bink: Factorize bink put_pixel
Conflicts:
libavcodec/bink.c
See: b3675f890abee0bc446495711223a5c790234672
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'doc/APIchanges')
0 files changed, 0 insertions, 0 deletions