diff options
| author | Michael Niedermayer <[email protected]> | 2015-03-11 21:36:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-03-11 21:37:09 +0100 |
| commit | 99ba7ee0eba556cdc7484152d5a9b3a80b9fe6de (patch) | |
| tree | 1b538eb5a76ccf892cb863b4489ac0e72a64b758 | |
| parent | c9a38ffe2ff57f71f72caee98a94eb535b5703c8 (diff) | |
| parent | ce57531a8894d69e3da085c7c6cba45b1f133b35 (diff) | |
Merge commit 'ce57531a8894d69e3da085c7c6cba45b1f133b35' into release/0.10
* commit 'ce57531a8894d69e3da085c7c6cba45b1f133b35':
swscale: Remove two bogus asserts
Merged-by: Michael Niedermayer <[email protected]>
0 files changed, 0 insertions, 0 deletions